From 0a1d415dc325ab95f43b750f2ec153db1e9f6ddf Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 17 Nov 2023 09:17:16 -0700 Subject: [PATCH 01/93] package/systemd: bump version to 254.6 Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index f0c3db60e7..c0f4638803 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 41873783aa1c680e10d2f2626797a1c2fef8018d69b68c8c77639e140ee7846d systemd-254.5.tar.gz +sha256 1e1e42c597b4f992679aa964a0c5c23d970c58fed47aed65c11878b332dc5b23 systemd-254.6.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index ccc0e14874..4746bda904 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -19,7 +19,7 @@ # - Diff sysusers.d with the previous version # - Diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) -SYSTEMD_VERSION = 254.5 +SYSTEMD_VERSION = 254.6 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ From 986a160cbe5c492acfda9bbf2048b1501d570072 Mon Sep 17 00:00:00 2001 From: Saeed Kazemi Date: Fri, 17 Nov 2023 19:32:16 +0100 Subject: [PATCH 02/93] package/eza: bump to version 0.16.0 Release notes: https://github.com/eza-community/eza/releases/tag/v0.16.0 Signed-off-by: Saeed Kazemi Signed-off-by: Yann E. MORIN --- package/eza/eza.hash | 2 +- package/eza/eza.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/eza/eza.hash b/package/eza/eza.hash index 39923ceb48..64f46759d7 100644 --- a/package/eza/eza.hash +++ b/package/eza/eza.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2dac8aa41433eeaa07c4eabdf557b7e134c3fda9ba9edb8ab57959354856e20c eza-0.14.0.tar.gz +sha256 11e6127a615744b52d52d66ebcdf9e5366f62746e8123b3eec00e35a057db988 eza-0.16.0.tar.gz sha256 2762990c7fbba9d550802a2593c1d857dcd52596bb0f9f192a97e9a7ac5f4f9e LICENCE diff --git a/package/eza/eza.mk b/package/eza/eza.mk index a327de0dcc..b11c1a1e7f 100644 --- a/package/eza/eza.mk +++ b/package/eza/eza.mk @@ -4,7 +4,7 @@ # ################################################################################ -EZA_VERSION = 0.14.0 +EZA_VERSION = 0.16.0 EZA_SITE = $(call github,eza-community,eza,v$(EZA_VERSION)) EZA_LICENSE = MIT EZA_LICENSE_FILES = LICENCE From 1cb0853489b8b908c56ff7e770aa940b5ed992ec Mon Sep 17 00:00:00 2001 From: Saeed Kazemi Date: Fri, 17 Nov 2023 19:47:34 +0100 Subject: [PATCH 03/93] package/procs: bump to version 0.14.3 Release notes: https://github.com/dalance/procs/releases/tag/v0.14.3 Signed-off-by: Saeed Kazemi Signed-off-by: Yann E. MORIN --- package/procs/procs.hash | 2 +- package/procs/procs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/procs/procs.hash b/package/procs/procs.hash index 1c2fb5c3d5..19832e3897 100644 --- a/package/procs/procs.hash +++ b/package/procs/procs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 643b7ba4b769ee9f336d441ecdac779c3d52e5719a15c14bb0acb3609ce1cd99 procs-0.14.0.tar.gz +sha256 2f9fdbcf7324952e22565ded58148fa40387b5a5f8723996620d6c4588925713 procs-0.14.3.tar.gz sha256 feb87a2e0c305de3464cc44077da5393c52d8ca6362d37427157d04ec6f4510d LICENSE diff --git a/package/procs/procs.mk b/package/procs/procs.mk index a074ee1311..8567bf3da3 100644 --- a/package/procs/procs.mk +++ b/package/procs/procs.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROCS_VERSION = 0.14.0 +PROCS_VERSION = 0.14.3 PROCS_SITE = $(call github,dalance,procs,v$(PROCS_VERSION)) PROCS_LICENSE = MIT PROCS_LICENSE_FILES = LICENSE From dbcb9554d561856abefbad5a339b40dd643eb25b Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Thu, 16 Nov 2023 20:33:11 +0100 Subject: [PATCH 04/93] package/open62541: bump to version 1.3.8 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/open62541/open62541.hash | 2 +- package/open62541/open62541.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/open62541/open62541.hash b/package/open62541/open62541.hash index 941aadf4eb..3508cbb146 100644 --- a/package/open62541/open62541.hash +++ b/package/open62541/open62541.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 410603b0e567970d7148c6e9c91ccabeedeb4f32780be859cd2a4aac08cb5b9e open62541-v1.3.7-br1.tar.gz +sha256 41e82d81d2fc9449028dab31fd460df1da29130bcb7388222842e778cf34625c open62541-v1.3.8-br1.tar.gz sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/open62541/open62541.mk b/package/open62541/open62541.mk index 43e1ad6b61..16ef51ed31 100644 --- a/package/open62541/open62541.mk +++ b/package/open62541/open62541.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPEN62541_VERSION = v1.3.7 +OPEN62541_VERSION = v1.3.8 OPEN62541_SITE_METHOD = git OPEN62541_SITE = https://github.com/open62541/open62541.git OPEN62541_GIT_SUBMODULES = YES From 44f138f44087a172c87865563ca6e3392f9e23df Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 15 Nov 2023 21:31:18 +0100 Subject: [PATCH 05/93] package/rtl8723ds: bump to 2023-11-14 version It supports up to Linux 6.7. Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/rtl8723ds/rtl8723ds.hash | 2 +- package/rtl8723ds/rtl8723ds.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8723ds/rtl8723ds.hash b/package/rtl8723ds/rtl8723ds.hash index e94a7b40ef..f2829d3f04 100644 --- a/package/rtl8723ds/rtl8723ds.hash +++ b/package/rtl8723ds/rtl8723ds.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 672787c3f3d1f795b750cd74de8ca34bb661b8ae60f5aa50fb279ec08ff3f05f rtl8723ds-ec85dc6b9f72bfe413bff464ed01a272e29c8dbe.tar.gz +sha256 4f3006ffc1604854edbd6d25ad468ca57f6bcfd7814e4dab57725f144f00aa94 rtl8723ds-52e593e8c889b68ba58bd51cbdbcad7fe71362e4.tar.gz sha256 cd5c66af63b509ccd75ec85fee41b6e5cbb77cd6bf9392a54900acc0f02be4a6 COPYING diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk index f62ce2bf6c..2536450d80 100644 --- a/package/rtl8723ds/rtl8723ds.mk +++ b/package/rtl8723ds/rtl8723ds.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8723DS_VERSION = ec85dc6b9f72bfe413bff464ed01a272e29c8dbe +RTL8723DS_VERSION = 52e593e8c889b68ba58bd51cbdbcad7fe71362e4 RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) RTL8723DS_LICENSE = GPL-2.0 RTL8723DS_LICENSE_FILES = COPYING From 40038a56324cde8cbe9ae8be44f90828498a830f Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 15 Nov 2023 21:31:17 +0100 Subject: [PATCH 06/93] package/rtl8192eu: bump to version 2023-11-13 on branch 5.11.2.1 It supports up to Linux 6.7. Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/rtl8192eu/rtl8192eu.hash | 2 +- package/rtl8192eu/rtl8192eu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8192eu/rtl8192eu.hash b/package/rtl8192eu/rtl8192eu.hash index 8528689670..e27acba124 100644 --- a/package/rtl8192eu/rtl8192eu.hash +++ b/package/rtl8192eu/rtl8192eu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 665a8f857b3881554edd6d5e5e6c8f058b8ecfecf921817993e861d48e214d36 rtl8192eu-ac8517206e14f70babbeed68e136ee23c85cba3d.tar.gz +sha256 2326902c27aee022bd1f6e49e8dbf789b08613e660385c23ded8038074d7929b rtl8192eu-a928f08c1dd4f9a1e84d85811a543e974551bc4f.tar.gz diff --git a/package/rtl8192eu/rtl8192eu.mk b/package/rtl8192eu/rtl8192eu.mk index 9ae29d9940..a2fde6fef0 100644 --- a/package/rtl8192eu/rtl8192eu.mk +++ b/package/rtl8192eu/rtl8192eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8192EU_VERSION = ac8517206e14f70babbeed68e136ee23c85cba3d +RTL8192EU_VERSION = a928f08c1dd4f9a1e84d85811a543e974551bc4f RTL8192EU_SITE = $(call github,clnhub,rtl8192eu-linux,$(RTL8192EU_VERSION)) RTL8192EU_LICENSE = GPL-2.0 From 00df26337744aadc64b950a9f75ec84ae602c208 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 15 Nov 2023 17:39:02 +0100 Subject: [PATCH 07/93] package/lualdap: bump to version 1.4.0 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/lualdap/lualdap.hash | 2 +- package/lualdap/lualdap.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lualdap/lualdap.hash b/package/lualdap/lualdap.hash index 97aa3b570e..62d8d20abf 100644 --- a/package/lualdap/lualdap.hash +++ b/package/lualdap/lualdap.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 c1772077ebfd02e082e89583701ef27dd348dc76ae015247f21a2756f5fac0ae lualdap-1.3.1-1.src.rock +sha256 865b915a3ff16b9663b76a77e89ec54a5028ccfe95e85ad704efbaa144a608f8 lualdap-1.4.0-1.src.rock sha256 b9b75da18d1e1147ec47bff508ffdce831da07dc371891b9057cf1c422660af4 lualdap/docs/license.md diff --git a/package/lualdap/lualdap.mk b/package/lualdap/lualdap.mk index 375754180f..a6fc612b79 100644 --- a/package/lualdap/lualdap.mk +++ b/package/lualdap/lualdap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUALDAP_VERSION = 1.3.1-1 +LUALDAP_VERSION = 1.4.0-1 LUALDAP_SUBDIR = lualdap LUALDAP_LICENSE = MIT LUALDAP_LICENSE_FILES = $(LUALDAP_SUBDIR)/docs/license.md From 3afe877f52e4571500f11a63d000c540d02c6488 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 15 Nov 2023 17:39:03 +0100 Subject: [PATCH 08/93] package/lua-testmore: bump to version 0.3.7 diff COPYRIGHT: -Copyright (C) 2009-2021 Francois Perrad. +Copyright (C) 2009-2023 Francois Perrad. Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/lua-testmore/lua-testmore.hash | 4 ++-- package/lua-testmore/lua-testmore.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lua-testmore/lua-testmore.hash b/package/lua-testmore/lua-testmore.hash index 1f435709f4..634b95c6e6 100644 --- a/package/lua-testmore/lua-testmore.hash +++ b/package/lua-testmore/lua-testmore.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 b3e57955888aba3974d6f5a21219214e2803a38e4623671f7d9d9e0f1851e608 lua-testmore-0.3.6-1.src.rock -sha256 37a3afb014325b98f0ad919cb40bc9d5a948120e5260e75b9d00c198d350da6d lua-TestMore-0.3.6/COPYRIGHT +sha256 acef148e10e312f262d9390c3cdbb9fdd3d5541f0dbeb4c35b8c37fbf95cb52f lua-testmore-0.3.7-1.src.rock +sha256 7cb577fd111373b813a9ec47e43c30cb318b771290e0b60e780b6a710116888d lua-TestMore-0.3.7/COPYRIGHT diff --git a/package/lua-testmore/lua-testmore.mk b/package/lua-testmore/lua-testmore.mk index e3cc7b7bdb..aaf2c13069 100644 --- a/package/lua-testmore/lua-testmore.mk +++ b/package/lua-testmore/lua-testmore.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_TESTMORE_VERSION = 0.3.6-1 +LUA_TESTMORE_VERSION = 0.3.7-1 LUA_TESTMORE_NAME_UPSTREAM = lua-TestMore LUA_TESTMORE_LICENSE = MIT LUA_TESTMORE_LICENSE_FILES = $(LUA_TESTMORE_SUBDIR)/COPYRIGHT From 6a172ffe6b2aa5c59427696775cfa4c189f99c19 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 14 Nov 2023 21:40:12 +0100 Subject: [PATCH 09/93] package/openblas: bump to version v0.3.25 For change log since v0.3.24, see: https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.25 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/openblas/openblas.hash | 6 +++--- package/openblas/openblas.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash index 8e416f98f6..d946ae7296 100644 --- a/package/openblas/openblas.hash +++ b/package/openblas/openblas.hash @@ -1,5 +1,5 @@ -# From https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.24 -md5 23599a30e4ce887590957d94896789c8 openblas-0.3.24.tar.gz +# From https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.25 +md5 48384e324cd1cdcfbdb0d2e16ca55327 openblas-0.3.25.tar.gz # Locally calculated -sha256 ceadc5065da97bd92404cac7254da66cc6eb192679cf1002098688978d4d5132 openblas-0.3.24.tar.gz +sha256 4c25cb30c4bb23eddca05d7d0a85997b8db6144f5464ba7f8c09ce91e2f35543 openblas-0.3.25.tar.gz sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index aacfc74b53..76833121a9 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENBLAS_VERSION = 0.3.24 +OPENBLAS_VERSION = 0.3.25 OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE From aea790392af5358568a4f1c5d2dd9f1adfb29109 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Mon, 13 Nov 2023 22:27:06 +0100 Subject: [PATCH 10/93] package/libabseil-cpp: bump to version 20230802.1 abseil and other google tools are now subject to "Google's Foundational C++ Support Policy" [0][1]. This currently mandates gcc 7.3.1 and C++14 as minimum versions. Since we don't have guards for patch versions of gcc 7 use gcc 8 as minimum. [0] https://github.com/abseil/abseil-cpp/releases/tag/20230125.0 [1] https://github.com/google/oss-policies-info/blob/b842c39db88e6569dfe2cf98be434b03507cb503/foundational-cxx-support-matrix.md Signed-off-by: Michael Nosthoff Signed-off-by: Yann E. MORIN --- package/collectd/Config.in | 6 +++--- package/falcosecurity-libs/Config.in | 2 +- package/grpc/Config.in | 6 +++--- package/libabseil-cpp/Config.in | 6 +++--- package/libabseil-cpp/libabseil-cpp.hash | 2 +- package/libabseil-cpp/libabseil-cpp.mk | 6 +++--- package/sysdig/Config.in | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index a431da79f1..d3b686771d 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -683,15 +683,15 @@ config BR2_PACKAGE_COLLECTD_GRPC depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC # grpc depends on BR2_INSTALL_LIBSTDCPP # grpc -> protobuf depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # grpc -> protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # grpc -> libabseil-cpp + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # grpc -> libabseil-cpp depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # grpc select BR2_PACKAGE_GRPC help Send/receive values using the gRPC protocol. -comment "grpc needs a toolchain w/ C++, gcc >= 5" +comment "grpc needs a toolchain w/ C++, gcc >= 8" depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # grpc diff --git a/package/falcosecurity-libs/Config.in b/package/falcosecurity-libs/Config.in index f101883384..028a0ed28b 100644 --- a/package/falcosecurity-libs/Config.in +++ b/package/falcosecurity-libs/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_FALCOSECURITY_LIBS depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf depends on BR2_LINUX_KERNEL depends on BR2_INSTALL_LIBSTDCPP # jsoncpp, protobuf, tbb - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # grpc, gtest + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # grpc -> libabseil-cpp depends on BR2_TOOLCHAIN_HAS_THREADS # jq, protobuf, tbb depends on !BR2_STATIC_LIBS # protobuf, tbb depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC # grpc diff --git a/package/grpc/Config.in b/package/grpc/Config.in index db6425819b..afe0ea8450 100644 --- a/package/grpc/Config.in +++ b/package/grpc/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_GRPC depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf, re2 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # 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 @@ -19,9 +19,9 @@ config BR2_PACKAGE_GRPC http://github.com/grpc/grpc -comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 5" +comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 8" 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_5 + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS diff --git a/package/libabseil-cpp/Config.in b/package/libabseil-cpp/Config.in index 45f339ff26..7b65ec40d0 100644 --- a/package/libabseil-cpp/Config.in +++ b/package/libabseil-cpp/Config.in @@ -18,7 +18,7 @@ config BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS config BR2_PACKAGE_LIBABSEIL_CPP bool "libabseil-cpp" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++14 depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS # uses dlfcn.h depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS @@ -31,7 +31,7 @@ config BR2_PACKAGE_LIBABSEIL_CPP https://github.com/abseil/abseil-cpp -comment "libabseil-cpp needs a toolchain w/ gcc >= 4.9, C++, threads, dynamic library" +comment "libabseil-cpp needs a toolchain w/ gcc >= 8, C++, threads, dynamic library" depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 diff --git a/package/libabseil-cpp/libabseil-cpp.hash b/package/libabseil-cpp/libabseil-cpp.hash index 808bdbab29..c3fc0d85e1 100644 --- a/package/libabseil-cpp/libabseil-cpp.hash +++ b/package/libabseil-cpp/libabseil-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8 libabseil-cpp-20220623.1.tar.gz +sha256 987ce98f02eefbaf930d6e38ab16aa05737234d7afbab2d5c4ea7adbe50c28ed libabseil-cpp-20230802.1.tar.gz sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 LICENSE diff --git a/package/libabseil-cpp/libabseil-cpp.mk b/package/libabseil-cpp/libabseil-cpp.mk index ceda106b7d..a5dfc8eb19 100644 --- a/package/libabseil-cpp/libabseil-cpp.mk +++ b/package/libabseil-cpp/libabseil-cpp.mk @@ -4,19 +4,19 @@ # ################################################################################ -LIBABSEIL_CPP_VERSION = 20220623.1 +LIBABSEIL_CPP_VERSION = 20230802.1 LIBABSEIL_CPP_SITE = $(call github,abseil,abseil-cpp,$(LIBABSEIL_CPP_VERSION)) LIBABSEIL_CPP_LICENSE = Apache-2.0 LIBABSEIL_CPP_LICENSE_FILES = LICENSE LIBABSEIL_CPP_INSTALL_STAGING = YES LIBABSEIL_CPP_CONF_OPTS = \ - -DCMAKE_CXX_STANDARD=11 \ + -DCMAKE_CXX_STANDARD=14 \ -DABSL_ENABLE_INSTALL=ON \ -DABSL_USE_GOOGLETEST_HEAD=OFF HOST_LIBABSEIL_CPP_CONF_OPTS = \ - -DCMAKE_CXX_STANDARD=11 \ + -DCMAKE_CXX_STANDARD=14 \ -DABSL_ENABLE_INSTALL=ON \ -DABSL_USE_GOOGLETEST_HEAD=OFF diff --git a/package/sysdig/Config.in b/package/sysdig/Config.in index c0a631bd49..3a3670f5cb 100644 --- a/package/sysdig/Config.in +++ b/package/sysdig/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_SYSDIG depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # falcosecurity-libs depends on BR2_LINUX_KERNEL # falcosecurity-libs depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # falcosecurity-libs + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # falcosecurity-libs -> grpc -> libabseil-cpp depends on BR2_TOOLCHAIN_HAS_THREADS # falcosecurity-libs depends on !BR2_STATIC_LIBS # falcosecurity-libs depends on BR2_TOOLCHAIN_USES_GLIBC # falcosecurity-libs @@ -23,12 +23,12 @@ config BR2_PACKAGE_SYSDIG https://github.com/draios/sysdig/wiki -comment "sysdig needs a glibc toolchain w/ C++, threads, gcc >= 5, dynamic library, a Linux kernel, and luajit or lua 5.1 to be built" +comment "sysdig needs a glibc toolchain w/ C++, threads, gcc >= 8, dynamic library, a Linux kernel, and luajit or lua 5.1 to be built" depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_LINUX_KERNEL || !BR2_INSTALL_LIBSTDCPP \ || !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_USES_GLIBC \ || !BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 From b6d4b0170fc181f86116aa3bcc39a538cce25144 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 13 Nov 2023 21:53:50 +0100 Subject: [PATCH 11/93] package/octave: bump package to version 8.4.0 See release note: https://octave.org/news/release/2023/11/05/octave-8.4.0-released.html Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/octave/octave.hash | 4 ++-- package/octave/octave.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/octave/octave.hash b/package/octave/octave.hash index a655f82849..20ee4ddb64 100644 --- a/package/octave/octave.hash +++ b/package/octave/octave.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -# https://ftp.gnu.org/gnu/octave/octave-8.3.0.tar.lz.sig +# https://ftp.gnu.org/gnu/octave/octave-8.4.0.tar.lz.sig # using key DBD9C84E39FE1AAE99F04446B05F05B75D36644B -sha256 4dbd5da711b20ce640d75471895172b60e0bb9f45b75a0daa5ddf3050488d639 octave-8.3.0.tar.lz +sha256 d5a7e89928528dce8cab7eead700be8a8319a98ec5334cc2ce83d29ac60264c1 octave-8.4.0.tar.lz sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/octave/octave.mk b/package/octave/octave.mk index 86f5564c02..cae0de7620 100644 --- a/package/octave/octave.mk +++ b/package/octave/octave.mk @@ -4,7 +4,7 @@ # ################################################################################ -OCTAVE_VERSION = 8.3.0 +OCTAVE_VERSION = 8.4.0 OCTAVE_SITE = https://ftp.gnu.org/gnu/octave OCTAVE_SOURCE = octave-$(OCTAVE_VERSION).tar.lz OCTAVE_LICENSE = GPL-3.0+ From d153e58d13f262f96c6c7c9a2bc0d31b76c8973d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?= Date: Mon, 13 Nov 2023 01:58:34 +0100 Subject: [PATCH 12/93] package/zfs: bump version to 2.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removed backported patch: - https://github.com/openzfs/zfs/commit/bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch Updated ZFS test to pass this new version; drop the explicit /pool mountpoint option to rely on the default location (which happens to be /pool already). Signed-off-by: José Luis Salvador Rufo Signed-off-by: Yann E. MORIN --- package/zfs/zfs.hash | 5 ++--- package/zfs/zfs.mk | 3 +-- support/testing/tests/package/test_zfs.py | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/zfs/zfs.hash b/package/zfs/zfs.hash index 3a73e5e94f..b02c49234a 100644 --- a/package/zfs/zfs.hash +++ b/package/zfs/zfs.hash @@ -1,6 +1,5 @@ -# From https://github.com/openzfs/zfs/releases/download/zfs-2.1.12/zfs-2.1.12.sha256.asc -sha256 64daa26aed3e12c931f6f4413d7527c4ebdb8da35416b356152b5f9fdd4c6e6d zfs-2.1.12.tar.gz -sha256 96a27353fe717ff2c8b95deb8b009c4eb750303c6400e2d8a2582ab1ec12b25a bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch +# Locally computed +sha256 42035fd059faa25a09cd511b24a57b8ad1285cb69127f2a0043b98562c5ec690 zfs-2.2.0.tar.gz # Hash for license files: sha256 1ffb70c33c4f79f04e947facc5c7851f289609256aacb47fc115f700427d9520 LICENSE diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index f0461ea9ec..d85956c98b 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -4,9 +4,8 @@ # ################################################################################ -ZFS_VERSION = 2.1.12 +ZFS_VERSION = 2.2.0 ZFS_SITE = https://github.com/openzfs/zfs/releases/download/zfs-$(ZFS_VERSION) -ZFS_PATCH = https://github.com/openzfs/zfs/commit/bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch ZFS_SELINUX_MODULES = zfs ZFS_LICENSE = CDDL ZFS_LICENSE_FILES = LICENSE COPYRIGHT diff --git a/support/testing/tests/package/test_zfs.py b/support/testing/tests/package/test_zfs.py index 1f01ddd768..27dbc2869b 100644 --- a/support/testing/tests/package/test_zfs.py +++ b/support/testing/tests/package/test_zfs.py @@ -40,11 +40,11 @@ class TestZfsBase(infra.basetest.BRTest): cmds = [ # Init - "modprobe zfs", + "modprobe zfs && sleep 2", "mount -o remount,size=132M /tmp", "fallocate -l 64M /tmp/container1.raw", "fallocate -l 64M /tmp/container2.raw", - "zpool create -m /pool pool raidz /tmp/container1.raw /tmp/container2.raw", + "zpool create pool raidz /tmp/container1.raw /tmp/container2.raw", "dd if=/dev/urandom bs=1M count=8 of=/pool/urandom", "sha256sum /pool/urandom > /tmp/urandom.sha256", # Check ZFS From da909bf2383a9f47a181d41f285a2e73565cdfc5 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 11 Nov 2023 20:52:24 +0100 Subject: [PATCH 13/93] package/harfbuzz: bump to version 8.3.0 Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- 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 69926f8c6a..fbe890910a 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e433ad85fbdf57f680be29479b3f964577379aaf319f557eb76569f0ecbc90f3 harfbuzz-8.2.2.tar.xz +sha256 109501eaeb8bde3eadb25fab4164e993fbace29c3d775bcaa1c1e58e2f15f847 harfbuzz-8.3.0.tar.xz sha256 ba8f810f2455c2f08e2d56bb49b72f37fcf68f1f4fade38977cfd7372050ad64 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 0dfe1b2056..4435cbb736 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 8.2.2 +HARFBUZZ_VERSION = 8.3.0 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From b41d4494a64b538ca0df2b3f18d19ae0a2e8a46a Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 10 Nov 2023 19:14:28 -0700 Subject: [PATCH 14/93] package/python-logbook: bump to version 1.7.0.post0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-logbook/python-logbook.hash | 4 ++-- package/python-logbook/python-logbook.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-logbook/python-logbook.hash b/package/python-logbook/python-logbook.hash index d77acad76e..8761945de6 100644 --- a/package/python-logbook/python-logbook.hash +++ b/package/python-logbook/python-logbook.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/logbook/json -md5 719970ea22dd274797bb4328161d700f Logbook-1.5.3.tar.gz -sha256 66f454ada0f56eae43066f604a222b09893f98c1adc18df169710761b8f32fe8 Logbook-1.5.3.tar.gz +md5 cbb7e5fb2d6325f42a323b0000127393 Logbook-1.7.0.post0.tar.gz +sha256 a5e8016701ca3beea6a390b0ba1541037f663543ca508ccd36cfdc841639cdd7 Logbook-1.7.0.post0.tar.gz # Locally computed sha256 checksums sha256 2ca266337cc6947578654ab0dd6438de4d01fa78b2e6eb554b09757df1178f98 LICENSE diff --git a/package/python-logbook/python-logbook.mk b/package/python-logbook/python-logbook.mk index 8f02e9b945..e47e78d26e 100644 --- a/package/python-logbook/python-logbook.mk +++ b/package/python-logbook/python-logbook.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_LOGBOOK_VERSION = 1.5.3 +PYTHON_LOGBOOK_VERSION = 1.7.0.post0 PYTHON_LOGBOOK_SOURCE = Logbook-$(PYTHON_LOGBOOK_VERSION).tar.gz -PYTHON_LOGBOOK_SITE = https://files.pythonhosted.org/packages/2f/d9/16ac346f7c0102835814cc9e5b684aaadea101560bb932a2403bd26b2320 +PYTHON_LOGBOOK_SITE = https://files.pythonhosted.org/packages/cc/98/c1d93c1d7593f58515333a6217aa4ae647d9ee9c1aa2dfdf77b28b7bb7c7 PYTHON_LOGBOOK_SETUP_TYPE = setuptools PYTHON_LOGBOOK_LICENSE = BSD-3-Clause PYTHON_LOGBOOK_LICENSE_FILES = LICENSE +PYTHON_LOGBOOK_DEPENDENCIES = host-python-cython $(eval $(python-package)) From a743087593a5fd5b33e2650591cada09929c27a6 Mon Sep 17 00:00:00 2001 From: Kalpesh Panchal Date: Fri, 10 Nov 2023 20:59:59 +0000 Subject: [PATCH 15/93] package/memtest86: bump to version 6.20 - bumped package version to 6.20 - as 6.20 prebuilt version is not available on same download site but source code is released at https://github.com/memtest86plus/memtest86plus/releases so updated mk file to download source from git release - prebuilt binary not found in 6.20 package and also README.md does not mention any toolchain limitation for compilation so added source build command depending on 32-bit or 64-bit x86 target. - corrected License file name - installed memtest binaries to image folder like other bootable images(grub , kernel) are copied. - updated config help as per package README.md Signed-off-by: Kalpesh Panchal Signed-off-by: Abhishek Anand Signed-off-by: Brandon Maier [yann.morin.1998@free.fr: - fix check-package errors - fix hash file - better install commands ] Signed-off-by: Yann E. MORIN --- package/memtest86/Config.in | 33 +++++++++++++++++++++++++------- package/memtest86/memtest86.hash | 4 ++-- package/memtest86/memtest86.mk | 29 +++++++++++++++++++++------- 3 files changed, 50 insertions(+), 16 deletions(-) diff --git a/package/memtest86/Config.in b/package/memtest86/Config.in index 79c0161020..c9a8cf749f 100644 --- a/package/memtest86/Config.in +++ b/package/memtest86/Config.in @@ -14,14 +14,33 @@ config BR2_PACKAGE_MEMTEST86 back again and verifies whether the result of the read is the same as what was written to memory. - Memtest86+ will only work on 32-bit or 64-bit x86 targets. - It boots as an i486 program and autodetects hardware. It can - be added to the grub2 boot menu by adding the following - lines to the bottom of /boot/grub/grub.cfg - note the use of - linux16. + Memtest86+ will only work on 32-bit or 64-bit x86 targets. It + boots and autodetects hardware. Refer README.md for boot + options. - menuentry "Memtest86+" { - linux16 /boot/memtest86+.bin + It can be loaded and run either directly by a PC BIOS (legacy + or UEFI) or via an intermediate bootloader that supports the + Linux 16-bit, 32-bit, 64-bit, or EFI handover boot protocol. + + It can be added to the grub2 boot menu by adding the following + lines to the bottom of grub.cfg + + Example for legacy BIOS using the Linux 16-bit boot protocol, + with built-in support for USB keyboards or running on a serial + line: + + menuentry "Start Memtest86+ (USB keyboards)" { + linux16 /boot/memtest.bin keyboard=both + } + menuentry "Start Memtest86+ (serial line)" { + linux16 /boot/memtest.bin console=ttyS0,115200 + } + + Or for UEFI BIOS using the Linux 32-bit or 64-bit boot + protocols, using USB keyboard: + + menuentry "Start Memtest86+ (USB keyboards)" { + linux /EFI/BOOT/memtest.efi keyboard=both } Other boot loaders will have similar requirements. diff --git a/package/memtest86/memtest86.hash b/package/memtest86/memtest86.hash index 559ae0ac6c..695e6a234b 100644 --- a/package/memtest86/memtest86.hash +++ b/package/memtest86/memtest86.hash @@ -1,3 +1,3 @@ # locally computed using sha256sum -sha256 142127b7953fbd829b1057fb64a78d3340c2b771484230a7347e94530a0d9039 memtest86+-5.01.tar.gz -sha256 2e15e2174b86640d7fbfcb62b51d9182062d9db71d66a46e5b01d736c68150ea README +sha256 463b2db66128e45c96be76136272e2ee940f1319804b1b88cc2ef04edccd01d8 memtest86-6.20.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/memtest86/memtest86.mk b/package/memtest86/memtest86.mk index eb071cc29d..c0f85755fe 100644 --- a/package/memtest86/memtest86.mk +++ b/package/memtest86/memtest86.mk @@ -4,15 +4,30 @@ # ################################################################################ -MEMTEST86_VERSION = 5.01 -MEMTEST86_SOURCE = memtest86+-$(MEMTEST86_VERSION).tar.gz -MEMTEST86_SITE = http://www.memtest.org/download/$(MEMTEST86_VERSION) +MEMTEST86_VERSION = 6.20 +MEMTEST86_SITE = $(call github,memtest86plus,memtest86plus,v$(MEMTEST86_VERSION)) MEMTEST86_LICENSE = GPL-2.0 -MEMTEST86_LICENSE_FILES = README +MEMTEST86_LICENSE_FILES = LICENSE +MEMTEST86_INSTALL_IMAGES = YES +MEMTEST86_INSTALL_TARGET = NO -# memtest86+ is sensitive to toolchain changes, use the shipped binary version -define MEMTEST86_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/precomp.bin $(TARGET_DIR)/boot/memtest86+.bin +ifeq ($(BR2_i386),y) +MEMTEST86_BUILD_DIR = build32 +else +ifeq ($(BR2_x86_64),y) +MEMTEST86_BUILD_DIR = build64 +endif +endif + +define MEMTEST86_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(MEMTEST86_BUILD_DIR) +endef + +define MEMTEST86_INSTALL_IMAGES_CMDS + $(foreach ext, bin efi, \ + $(INSTALL) -m 0755 -D $(@D)/$(MEMTEST86_BUILD_DIR)/memtest.$(ext) \ + $(BINARIES_DIR)/memtest.$(ext) + ) endef $(eval $(generic-package)) From a7d2810bc9082d168799c051a4f2e5937a9254a1 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 16:25:19 -0700 Subject: [PATCH 16/93] package/python-orjson: bump to version 3.9.10 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-orjson/python-orjson.hash | 2 +- package/python-orjson/python-orjson.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-orjson/python-orjson.hash b/package/python-orjson/python-orjson.hash index 773fb14568..0e9b93f311 100644 --- a/package/python-orjson/python-orjson.hash +++ b/package/python-orjson/python-orjson.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 048938fd9153f37eaf7a08b748de94ff87b2488dd3bd9f96c3ae784527a961b3 orjson-3.9.2.tar.gz +sha256 245a1ad9a8f926273787e91f7d7e14b4b357e263a215d8c96dd2039b3cddc238 orjson-3.9.10.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/python-orjson/python-orjson.mk b/package/python-orjson/python-orjson.mk index cf05b26262..a2e8a50468 100644 --- a/package/python-orjson/python-orjson.mk +++ b/package/python-orjson/python-orjson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ORJSON_VERSION = 3.9.2 +PYTHON_ORJSON_VERSION = 3.9.10 PYTHON_ORJSON_SOURCE = orjson-$(PYTHON_ORJSON_VERSION).tar.gz -PYTHON_ORJSON_SITE = https://files.pythonhosted.org/packages/30/a4/96bcb52da0de9ccfcd99a60719b995c9b9c3aaa3a70701f0790ce856c10d +PYTHON_ORJSON_SITE = https://files.pythonhosted.org/packages/72/75/642688bf5d99131fe8cf603f4ef9f26e4b1c6ed8f7f5c7e6fb31def54fb7 PYTHON_ORJSON_SETUP_TYPE = maturin PYTHON_ORJSON_LICENSE = Apache-2.0 or MIT PYTHON_ORJSON_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT From 0cdce6d53f744252d6799ae63894b93f7f03e2ea Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 16:59:52 -0700 Subject: [PATCH 17/93] package/python-mako: bump to version 1.3.0 License hash changed due to year update: https://github.com/sqlalchemy/mako/commit/272f5d8cc97aee829e3b285486f33c9c8e604c74 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-mako/python-mako.hash | 6 +++--- package/python-mako/python-mako.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-mako/python-mako.hash b/package/python-mako/python-mako.hash index a010e8d8f6..03651cf956 100644 --- a/package/python-mako/python-mako.hash +++ b/package/python-mako/python-mako.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/mako/json -md5 651f365616611fcd4f2702a9002e2195 Mako-1.2.4.tar.gz -sha256 d60a3903dc3bb01a18ad6a89cdbe2e4eadc69c0bc8ef1e3773ba53d44c3f7a34 Mako-1.2.4.tar.gz +md5 90da23903468efe9aa88dc88081579ff Mako-1.3.0.tar.gz +sha256 e3a9d388fd00e87043edbe8792f45880ac0114e9c4adc69f6e9bfb2c55e3b11b Mako-1.3.0.tar.gz # Locally computed sha256 checksums -sha256 760f22b3e9ea4a50eb99201bd8dd118869f28108cfb64ccce6d1b305cf9ae9fa LICENSE +sha256 0a326e448dd22f220dd30796677ddbdf3ddaa6427a9744fea9deaa51d9d74fd9 LICENSE diff --git a/package/python-mako/python-mako.mk b/package/python-mako/python-mako.mk index 313fbfcab2..1f7a0b0657 100644 --- a/package/python-mako/python-mako.mk +++ b/package/python-mako/python-mako.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MAKO_VERSION = 1.2.4 +PYTHON_MAKO_VERSION = 1.3.0 PYTHON_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz -PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/05/5f/2ba6e026d33a0e6ddc1dddf9958677f76f5f80c236bd65309d280b166d3e +PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/a9/6e/6b41e654bbdcef90c6b9e7f280bf7cbd756dc2560ce76214f5cdbc4ddab5 PYTHON_MAKO_SETUP_TYPE = setuptools PYTHON_MAKO_LICENSE = MIT PYTHON_MAKO_LICENSE_FILES = LICENSE From 134e65f023d6a9e28ceea595fe5e7c66f58837ca Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 21:51:45 -0700 Subject: [PATCH 18/93] package/python-outcome: bump to version 1.3.0.post0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-outcome/python-outcome.hash | 4 ++-- package/python-outcome/python-outcome.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-outcome/python-outcome.hash b/package/python-outcome/python-outcome.hash index 43796e89ac..476da60766 100644 --- a/package/python-outcome/python-outcome.hash +++ b/package/python-outcome/python-outcome.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/outcome/json -md5 58612ee4407901985f85ad3869dd83b8 outcome-1.2.0.tar.gz -sha256 6f82bd3de45da303cf1f771ecafa1633750a358436a8bb60e06a1ceb745d2672 outcome-1.2.0.tar.gz +md5 3a626832ac864c95f6054958d0da3011 outcome-1.3.0.post0.tar.gz +sha256 9dcf02e65f2971b80047b377468e72a268e15c0af3cf1238e6ff14f7f91143b8 outcome-1.3.0.post0.tar.gz # Locally computed sha256 checksums sha256 652c878488d1456361e08c3f8607fd7ba59892a14103d15cce4ff93c85b5cc8b LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.APACHE2 diff --git a/package/python-outcome/python-outcome.mk b/package/python-outcome/python-outcome.mk index 27d7fdede3..aa8a6cbf38 100644 --- a/package/python-outcome/python-outcome.mk +++ b/package/python-outcome/python-outcome.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_OUTCOME_VERSION = 1.2.0 +PYTHON_OUTCOME_VERSION = 1.3.0.post0 PYTHON_OUTCOME_SOURCE = outcome-$(PYTHON_OUTCOME_VERSION).tar.gz -PYTHON_OUTCOME_SITE = https://files.pythonhosted.org/packages/dd/91/741e1626e89fdc3664169e16300c59eefa4b23540cc6d6c70450f885098f +PYTHON_OUTCOME_SITE = https://files.pythonhosted.org/packages/98/df/77698abfac98571e65ffeb0c1fba8ffd692ab8458d617a0eed7d9a8d38f2 PYTHON_OUTCOME_SETUP_TYPE = setuptools PYTHON_OUTCOME_LICENSE = Apache-2.0 or MIT PYTHON_OUTCOME_LICENSE_FILES = LICENSE LICENSE.APACHE2 LICENSE.MIT From c4749c6f82a2009ab9b7ae084a60344344b98f11 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 21:56:21 -0700 Subject: [PATCH 19/93] package/python-packaging: bump to version 23.2 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-packaging/python-packaging.hash | 4 ++-- package/python-packaging/python-packaging.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-packaging/python-packaging.hash b/package/python-packaging/python-packaging.hash index 0e339ea573..df75c3505c 100644 --- a/package/python-packaging/python-packaging.hash +++ b/package/python-packaging/python-packaging.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/packaging/json -md5 f7d5c39c6f92cc2dfa1293ba8f6c097c packaging-23.1.tar.gz -sha256 a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f packaging-23.1.tar.gz +md5 d54eeff8c7ca86980528f4132f258d54 packaging-23.2.tar.gz +sha256 048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5 packaging-23.2.tar.gz # Locally computed sha256 checksums sha256 cad1ef5bd340d73e074ba614d26f7deaca5c7940c3d8c34852e65c4909686c48 LICENSE sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.APACHE diff --git a/package/python-packaging/python-packaging.mk b/package/python-packaging/python-packaging.mk index aac4d76ee2..3e0f85c00a 100644 --- a/package/python-packaging/python-packaging.mk +++ b/package/python-packaging/python-packaging.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PACKAGING_VERSION = 23.1 +PYTHON_PACKAGING_VERSION = 23.2 PYTHON_PACKAGING_SOURCE = packaging-$(PYTHON_PACKAGING_VERSION).tar.gz -PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/b9/6c/7c6658d258d7971c5eb0d9b69fa9265879ec9a9158031206d47800ae2213 +PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/fb/2b/9b9c33ffed44ee921d0967086d653047286054117d584f1b1a7c22ceaf7b PYTHON_PACKAGING_SETUP_TYPE = flit PYTHON_PACKAGING_LICENSE = Apache-2.0 or BSD-2-Clause PYTHON_PACKAGING_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD From 6c70212a09253eb5fb79c715e7fff7fb786a74ba Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 21:59:13 -0700 Subject: [PATCH 20/93] package/python-paramiko: bump to version 3.3.1 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-paramiko/python-paramiko.hash | 4 ++-- package/python-paramiko/python-paramiko.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-paramiko/python-paramiko.hash b/package/python-paramiko/python-paramiko.hash index b327a6b8a9..abc62fc8c2 100644 --- a/package/python-paramiko/python-paramiko.hash +++ b/package/python-paramiko/python-paramiko.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/paramiko/json -md5 3f49814473cc153a7189fec31cfacfab paramiko-2.12.0.tar.gz -sha256 376885c05c5d6aa6e1f4608aac2a6b5b0548b1add40274477324605903d9cd49 paramiko-2.12.0.tar.gz +md5 08b1610e3ba9fa89e13973710cd48e35 paramiko-3.3.1.tar.gz +sha256 6a3777a961ac86dbef375c5f5b8d50014a1a96d0fd7f054a43bc880134b0ff77 paramiko-3.3.1.tar.gz # Locally computed sha256 checksums sha256 5fa25bf5f395fd26e701c2e1de4ca7d162816986dc791c22f8f4226857ad1bb2 LICENSE diff --git a/package/python-paramiko/python-paramiko.mk b/package/python-paramiko/python-paramiko.mk index 621176ed41..512a4630f5 100644 --- a/package/python-paramiko/python-paramiko.mk +++ b/package/python-paramiko/python-paramiko.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PARAMIKO_VERSION = 2.12.0 +PYTHON_PARAMIKO_VERSION = 3.3.1 PYTHON_PARAMIKO_SOURCE = paramiko-$(PYTHON_PARAMIKO_VERSION).tar.gz -PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/98/75/e78ddbe671a4a59514b59bc6a321263118e4ac3fe88175dd784d1a47a00f +PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/44/03/158ae1dcb950bd96f04038502238159e116fafb27addf5df1ba35068f2d6 PYTHON_PARAMIKO_SETUP_TYPE = setuptools PYTHON_PARAMIKO_LICENSE = LGPL-2.1+ PYTHON_PARAMIKO_LICENSE_FILES = LICENSE From 31d7d323808083e2b8e25a7fdbee08f5486ee291 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 22:06:25 -0700 Subject: [PATCH 21/93] package/python-pathspec: bump to version 0.11.2 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pathspec/python-pathspec.hash | 4 ++-- package/python-pathspec/python-pathspec.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pathspec/python-pathspec.hash b/package/python-pathspec/python-pathspec.hash index 5eb76cb5f9..01177b7428 100644 --- a/package/python-pathspec/python-pathspec.hash +++ b/package/python-pathspec/python-pathspec.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pathspec/json -md5 d89408b52aff020ac768a14c0ef1c7de pathspec-0.10.3.tar.gz -sha256 56200de4077d9d0791465aa9095a01d421861e405b5096955051deefd697d6f6 pathspec-0.10.3.tar.gz +md5 92ebd6d735d261952ff99d64083eeff4 pathspec-0.11.2.tar.gz +sha256 e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3 pathspec-0.11.2.tar.gz # Locally computed sha256 checksums sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/python-pathspec/python-pathspec.mk b/package/python-pathspec/python-pathspec.mk index e88bce231f..d32b6a56e1 100644 --- a/package/python-pathspec/python-pathspec.mk +++ b/package/python-pathspec/python-pathspec.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PATHSPEC_VERSION = 0.10.3 +PYTHON_PATHSPEC_VERSION = 0.11.2 PYTHON_PATHSPEC_SOURCE = pathspec-$(PYTHON_PATHSPEC_VERSION).tar.gz -PYTHON_PATHSPEC_SITE = https://files.pythonhosted.org/packages/32/1a/6baf904503c3e943cae9605c9c88a43b964dea5b59785cf956091b341b08 +PYTHON_PATHSPEC_SITE = https://files.pythonhosted.org/packages/a0/2a/bd167cdf116d4f3539caaa4c332752aac0b3a0cc0174cdb302ee68933e81 PYTHON_PATHSPEC_LICENSE = MPL-2.0 PYTHON_PATHSPEC_LICENSE_FILES = LICENSE PYTHON_PATHSPEC_SETUP_TYPE = setuptools From c3f74b50daf957881f242872c501241f915e8d51 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 22:11:54 -0700 Subject: [PATCH 22/93] package/python-pathvalidate: bump to version 3.2.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pathvalidate/python-pathvalidate.hash | 4 ++-- package/python-pathvalidate/python-pathvalidate.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pathvalidate/python-pathvalidate.hash b/package/python-pathvalidate/python-pathvalidate.hash index 828236304e..4442d82ac1 100644 --- a/package/python-pathvalidate/python-pathvalidate.hash +++ b/package/python-pathvalidate/python-pathvalidate.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pathvalidate/json -md5 541238984572fb21db2da2af1d70a993 pathvalidate-2.5.2.tar.gz -sha256 5ff57d0fabe5ecb7a4f1e4957bfeb5ad8ab5ab4c0fa71f79c6bbc24bd9b7d14d pathvalidate-2.5.2.tar.gz +md5 2a76cbe4e08f58087f418d150a1461b5 pathvalidate-3.2.0.tar.gz +sha256 5e8378cf6712bff67fbe7a8307d99fa8c1a0cb28aa477056f8fc374f0dff24ad pathvalidate-3.2.0.tar.gz # Locally computed sha256 checksums sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE diff --git a/package/python-pathvalidate/python-pathvalidate.mk b/package/python-pathvalidate/python-pathvalidate.mk index 6ca8c0f2ad..243f541892 100644 --- a/package/python-pathvalidate/python-pathvalidate.mk +++ b/package/python-pathvalidate/python-pathvalidate.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PATHVALIDATE_VERSION = 2.5.2 +PYTHON_PATHVALIDATE_VERSION = 3.2.0 PYTHON_PATHVALIDATE_SOURCE = pathvalidate-$(PYTHON_PATHVALIDATE_VERSION).tar.gz -PYTHON_PATHVALIDATE_SITE = https://files.pythonhosted.org/packages/60/f7/ff244fdd8ed98e98d4f9acecfe74a890e5e3245ce55253ef88db51e94652 +PYTHON_PATHVALIDATE_SITE = https://files.pythonhosted.org/packages/27/93/e2b086c7aba96c70b5e7ef48251702fb95027638fb5a3e787d2efd65783e PYTHON_PATHVALIDATE_SETUP_TYPE = setuptools PYTHON_PATHVALIDATE_LICENSE = MIT PYTHON_PATHVALIDATE_LICENSE_FILES = LICENSE From 47d43fe906c4f0ce5eed14ee1affd846fbae4be2 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 22:14:37 -0700 Subject: [PATCH 23/93] package/python-pbr: bump to version 6.0.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pbr/python-pbr.hash | 4 ++-- package/python-pbr/python-pbr.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pbr/python-pbr.hash b/package/python-pbr/python-pbr.hash index 4ca503e976..cfeef9419d 100644 --- a/package/python-pbr/python-pbr.hash +++ b/package/python-pbr/python-pbr.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pbr/json -md5 99ef94dbe5a00054fdcbbaa87268c3cd pbr-5.11.0.tar.gz -sha256 b97bc6695b2aff02144133c2e7399d5885223d42b7912ffaec2ca3898e673bfe pbr-5.11.0.tar.gz +md5 e01bcc0e9154d513ecad3e766f9582d7 pbr-6.0.0.tar.gz +sha256 d1377122a5a00e2f940ee482999518efe16d745d423a670c27773dfbc3c9a7d9 pbr-6.0.0.tar.gz # Locally computed sha256 checksums sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 LICENSE sha256 eb4a8c8791f6caab1cf36df26db2b6f4e2ddda52657b060ff7f02abc63910aef pbr/tests/testpackage/LICENSE.txt diff --git a/package/python-pbr/python-pbr.mk b/package/python-pbr/python-pbr.mk index 99f0101e19..aaea80d389 100644 --- a/package/python-pbr/python-pbr.mk +++ b/package/python-pbr/python-pbr.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PBR_VERSION = 5.11.0 +PYTHON_PBR_VERSION = 6.0.0 PYTHON_PBR_SOURCE = pbr-$(PYTHON_PBR_VERSION).tar.gz -PYTHON_PBR_SITE = https://files.pythonhosted.org/packages/52/fb/630d52aaca8fc7634a0711b6ae12a0e828b6f9264bd8051225025c3ed075 +PYTHON_PBR_SITE = https://files.pythonhosted.org/packages/8d/c2/ee43b3b11bf2b40e56536183fc9f22afbb04e882720332b6276ee2454c24 PYTHON_PBR_SETUP_TYPE = setuptools PYTHON_PBR_LICENSE = Apache-2.0 (module), BSD-3-Clause (test package) PYTHON_PBR_LICENSE_FILES = LICENSE pbr/tests/testpackage/LICENSE.txt From 35744a2c0265d88f1264629f041e1676a0e99f32 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 22:22:11 -0700 Subject: [PATCH 24/93] package/python-periphery: bump to version 2.4.1 License hash changed due to year update: https://github.com/vsergeev/python-periphery/commit/c0e6741ee294fb9362ddc4b60088f18bb1c27f8d Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-periphery/python-periphery.hash | 8 +++++--- package/python-periphery/python-periphery.mk | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/python-periphery/python-periphery.hash b/package/python-periphery/python-periphery.hash index 24e104d3ad..a758fa7a4d 100644 --- a/package/python-periphery/python-periphery.hash +++ b/package/python-periphery/python-periphery.hash @@ -1,3 +1,5 @@ -# Locally calculated -sha256 385716bdbd11fcf2c5728548c3d42f12ebc0974faa64fa1a98b89b4a44dc004c python-periphery-2.3.0.tar.gz -sha256 76fe342043adfe8d9453c4979aa165476875137e15b0ddea1f4c3f3fa9808361 LICENSE +# md5, sha256 from https://pypi.org/pypi/python-periphery/json +md5 2b2a1037fb4ac15e7b0514ce3659d26c python-periphery-2.4.1.tar.gz +sha256 61d461d736982a6f766e878720ab10a68151e2e8c1086600d9389ac47e40e88a python-periphery-2.4.1.tar.gz +# Locally computed sha256 checksums +sha256 321124461e9f86f4f7bb9f571500bf58ec1b76206b642e505ce17db7f7c88e05 LICENSE diff --git a/package/python-periphery/python-periphery.mk b/package/python-periphery/python-periphery.mk index 2c533fa2c2..7a49f305a5 100644 --- a/package/python-periphery/python-periphery.mk +++ b/package/python-periphery/python-periphery.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PERIPHERY_VERSION = 2.3.0 -PYTHON_PERIPHERY_SITE = $(call github,vsergeev,python-periphery,v$(PYTHON_PERIPHERY_VERSION)) +PYTHON_PERIPHERY_VERSION = 2.4.1 +PYTHON_PERIPHERY_SITE = https://files.pythonhosted.org/packages/df/f1/1a986ad2bb696033168db2121151e5ff90df033af780ffca47c8bb559f29 PYTHON_PERIPHERY_LICENSE = MIT PYTHON_PERIPHERY_LICENSE_FILES = LICENSE PYTHON_PERIPHERY_SETUP_TYPE = setuptools From 96980b4738c5adada09e39abac4c3087954cf1ce Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 22:29:49 -0700 Subject: [PATCH 25/93] package/python-pillow: bump to version 10.1.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- 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 c2c5125678..92258a6712 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 93a0585ab0ee9717a7576129bdabdf93 Pillow-10.0.1.tar.gz -sha256 d72967b06be9300fed5cfbc8b5bafceec48bf7cdc7dab66b1d2549035287191d Pillow-10.0.1.tar.gz +md5 a55618c5d2fd64048dd3ea41bc39f7cd Pillow-10.1.0.tar.gz +sha256 e6bf8de6c36ed96c86ea3b6e1d5273c53f46ef518a062464cd7ef5dd2cf92e38 Pillow-10.1.0.tar.gz # Locally computed sha256 checksums sha256 0fdb68ffb39062553be40be4e6eaea9700b4f5e870a720ae86b8925d67613ddd LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index d9f6fba861..bc94062da8 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 10.0.1 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/64/9e/7e638579cce7dc346632f020914141a164a872be813481f058883ee8d421 +PYTHON_PILLOW_VERSION = 10.1.0 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/80/d7/c4b258c9098b469c4a4e77b0a99b5f4fd21e359c2e486c977d231f52fc71 PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE From 58a920e5fb364543dad9a4b328aa4ddaa3bdfa0b Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 22:34:48 -0700 Subject: [PATCH 26/93] package/python-pip: bump to version 23.3.1 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pip/python-pip.hash | 4 ++-- package/python-pip/python-pip.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pip/python-pip.hash b/package/python-pip/python-pip.hash index b41ce47d4c..9518c9d8b8 100644 --- a/package/python-pip/python-pip.hash +++ b/package/python-pip/python-pip.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pip/json -md5 996f58a94fe0b8b82b6795c42bd171ba pip-22.3.1.tar.gz -sha256 65fd48317359f3af8e593943e6ae1506b66325085ea64b706a998c6e83eeaf38 pip-22.3.1.tar.gz +md5 f0c9fba61e9d9badcc9921062e993d84 pip-23.3.1.tar.gz +sha256 1fcaa041308d01f14575f6d0d2ea4b75a3e2871fe4f9c694976f908768e14174 pip-23.3.1.tar.gz # Locally computed sha256 checksums sha256 634300a669d49aeae65b12c6c48c924c51a4cdf3d1ff086dc3456dc8bcaa2104 LICENSE.txt diff --git a/package/python-pip/python-pip.mk b/package/python-pip/python-pip.mk index 040767930e..83a1631a2f 100644 --- a/package/python-pip/python-pip.mk +++ b/package/python-pip/python-pip.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PIP_VERSION = 22.3.1 +PYTHON_PIP_VERSION = 23.3.1 PYTHON_PIP_SOURCE = pip-$(PYTHON_PIP_VERSION).tar.gz -PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/a3/50/c4d2727b99052780aad92c7297465af5fe6eec2dbae490aa9763273ffdc1 +PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/1f/7f/4da15e07ccd11c84c1ccc8f6e24288d5e76c99441bf80e315b33542db951 PYTHON_PIP_SETUP_TYPE = setuptools PYTHON_PIP_LICENSE = MIT PYTHON_PIP_LICENSE_FILES = LICENSE.txt From 90eeb059105d51b7f57e57a9180e7f6156520712 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 22:40:16 -0700 Subject: [PATCH 27/93] package/python-portend: bump to version 3.2.0 License hash changed due to notice removal: https://github.com/jaraco/portend/commit/5957d58266e479f124b31f30e4322e798fdf386b Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-portend/python-portend.hash | 6 +++--- package/python-portend/python-portend.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-portend/python-portend.hash b/package/python-portend/python-portend.hash index 6af3b77792..98e196bec8 100644 --- a/package/python-portend/python-portend.hash +++ b/package/python-portend/python-portend.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/portend/json -md5 c37d676837505a6fc8dd33185c6d62a7 portend-3.1.0.tar.gz -sha256 239e3116045ea823f6df87d6168107ad75ccc0590e37242af0cc1e98c5d224e4 portend-3.1.0.tar.gz +md5 0c3a2e8073c384b826f87795766f1e0e portend-3.2.0.tar.gz +sha256 5250a352c19c959d767cac878b829d93e5dc7625a5143399a2a00dc6628ffb72 portend-3.2.0.tar.gz # Locally computed sha256 checksums -sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE +sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-portend/python-portend.mk b/package/python-portend/python-portend.mk index 4322121e9b..5415198ffb 100644 --- a/package/python-portend/python-portend.mk +++ b/package/python-portend/python-portend.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PORTEND_VERSION = 3.1.0 +PYTHON_PORTEND_VERSION = 3.2.0 PYTHON_PORTEND_SOURCE = portend-$(PYTHON_PORTEND_VERSION).tar.gz -PYTHON_PORTEND_SITE = https://files.pythonhosted.org/packages/6e/0a/42bcc9c97744958ce72d33f526e972379b9e90adede8a151f338818c41d4 +PYTHON_PORTEND_SITE = https://files.pythonhosted.org/packages/8f/fc/bcfc768996b438d6e4bde7a6c8cfd62089847b0f5381a0e0ec2d8ee6b202 PYTHON_PORTEND_LICENSE = MIT PYTHON_PORTEND_LICENSE_FILES = LICENSE PYTHON_PORTEND_SETUP_TYPE = setuptools From 7748d228e66c70d570acea07e4ff749ec3146279 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 22:42:14 -0700 Subject: [PATCH 28/93] package/python-prompt-toolkit: bump to version 3.0.41 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-prompt-toolkit/python-prompt-toolkit.hash | 4 ++-- package/python-prompt-toolkit/python-prompt-toolkit.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-prompt-toolkit/python-prompt-toolkit.hash b/package/python-prompt-toolkit/python-prompt-toolkit.hash index 62ba0c3cfe..54130f3ae0 100644 --- a/package/python-prompt-toolkit/python-prompt-toolkit.hash +++ b/package/python-prompt-toolkit/python-prompt-toolkit.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/prompt-toolkit/json -md5 5a2bb559c0bcbc617f507a320c64ba03 prompt_toolkit-3.0.36.tar.gz -sha256 3e163f254bef5a03b146397d7c1963bd3e2812f0964bb9a24e6ec761fd28db63 prompt_toolkit-3.0.36.tar.gz +md5 252a5d200e41d46b65a3076d2bc0a4bd prompt_toolkit-3.0.41.tar.gz +sha256 941367d97fc815548822aa26c2a269fdc4eb21e9ec05fc5d447cf09bad5d75f0 prompt_toolkit-3.0.41.tar.gz # Locally computed sha256 checksums sha256 303574d9bdd85c757d6025017942bf17baeedf2778f62bd7f425d07d880f4c4a LICENSE diff --git a/package/python-prompt-toolkit/python-prompt-toolkit.mk b/package/python-prompt-toolkit/python-prompt-toolkit.mk index 426fa41e0b..db40f6c7eb 100644 --- a/package/python-prompt-toolkit/python-prompt-toolkit.mk +++ b/package/python-prompt-toolkit/python-prompt-toolkit.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PROMPT_TOOLKIT_VERSION = 3.0.36 +PYTHON_PROMPT_TOOLKIT_VERSION = 3.0.41 PYTHON_PROMPT_TOOLKIT_SOURCE = prompt_toolkit-$(PYTHON_PROMPT_TOOLKIT_VERSION).tar.gz -PYTHON_PROMPT_TOOLKIT_SITE = https://files.pythonhosted.org/packages/fb/93/180be2342f89f16543ec4eb3f25083b5b84eba5378f68efff05409fb39a9 +PYTHON_PROMPT_TOOLKIT_SITE = https://files.pythonhosted.org/packages/d9/7b/7d88d94427e1e179e0a62818e68335cf969af5ca38033c0ca02237ab6ee7 PYTHON_PROMPT_TOOLKIT_SETUP_TYPE = setuptools PYTHON_PROMPT_TOOLKIT_LICENSE = BSD-3-Clause PYTHON_PROMPT_TOOLKIT_LICENSE_FILES = LICENSE From 778fddf9e2020bce64df78c7f86edcd4b62e80cb Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 22:48:59 -0700 Subject: [PATCH 29/93] package/python-psutil: bump to version 5.9.6 License hash changed due to quote removal: https://github.com/giampaolo/psutil/commit/bea3cf2d16899251b4b5f6b2609db9881645ea2d Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-psutil/python-psutil.hash | 6 +++--- package/python-psutil/python-psutil.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-psutil/python-psutil.hash b/package/python-psutil/python-psutil.hash index 15927562b1..f388118663 100644 --- a/package/python-psutil/python-psutil.hash +++ b/package/python-psutil/python-psutil.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/psutil/json -md5 f72751d05b781757b7cd9bc375d2e351 psutil-5.9.4.tar.gz -sha256 3d7f9739eb435d4b1338944abe23f49584bde5395f27487d2ee25ad9a8774a62 psutil-5.9.4.tar.gz +md5 eec35090e7474e471a12f0dd16c981f9 psutil-5.9.6.tar.gz +sha256 e4b92ddcd7dd4cdd3f900180ea1e104932c7bce234fb88976e2a3b296441225a psutil-5.9.6.tar.gz # Locally computed sha256 checksums -sha256 24c12984500caa07ffdce19eebc06396c5e6d244b573bc6c438f4a6ef8e56c1b LICENSE +sha256 b89c063b3786e28e0c0a38f1931db61fed35e69dd2a2966fbecffee0f46c8d10 LICENSE diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk index e764d1accc..ece1039a51 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PSUTIL_VERSION = 5.9.4 +PYTHON_PSUTIL_VERSION = 5.9.6 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz -PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/3d/7d/d05864a69e452f003c0d77e728e155a89a2a26b09e64860ddd70ad64fb26 +PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/2d/01/beb7331fc6c8d1c49dd051e3611379bfe379e915c808e1301506027fce9d PYTHON_PSUTIL_SETUP_TYPE = setuptools PYTHON_PSUTIL_LICENSE = BSD-3-Clause PYTHON_PSUTIL_LICENSE_FILES = LICENSE From 3223987c937c5e7ef2caf0166bb45f4089d89b2f Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 23:01:55 -0700 Subject: [PATCH 30/93] package/python-psycopg2: bump to version 2.9.9 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-psycopg2/python-psycopg2.hash | 4 ++-- package/python-psycopg2/python-psycopg2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-psycopg2/python-psycopg2.hash b/package/python-psycopg2/python-psycopg2.hash index 58f98f9d84..6659c6cef8 100644 --- a/package/python-psycopg2/python-psycopg2.hash +++ b/package/python-psycopg2/python-psycopg2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/psycopg2/json -md5 3cec7285f61690633bb070d4bba259c2 psycopg2-2.9.5.tar.gz -sha256 a5246d2e683a972e2187a8714b5c2cf8156c064629f9a9b1a873c1730d9e245a psycopg2-2.9.5.tar.gz +md5 eae35fa97cdc92b910b706c720a257c7 psycopg2-2.9.9.tar.gz +sha256 d1454bde93fb1e224166811694d600e746430c006fbb031ea06ecc2ea41bf156 psycopg2-2.9.9.tar.gz # Locally computed sha256 checksums sha256 9614b85dfc9a72c5b2ca33144c1d7e1ed3b1c297459d9fb28a6a5762c2e8d71b LICENSE diff --git a/package/python-psycopg2/python-psycopg2.mk b/package/python-psycopg2/python-psycopg2.mk index fa23c2814f..0149b8d185 100644 --- a/package/python-psycopg2/python-psycopg2.mk +++ b/package/python-psycopg2/python-psycopg2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PSYCOPG2_VERSION = 2.9.5 +PYTHON_PSYCOPG2_VERSION = 2.9.9 PYTHON_PSYCOPG2_SOURCE = psycopg2-$(PYTHON_PSYCOPG2_VERSION).tar.gz -PYTHON_PSYCOPG2_SITE = https://files.pythonhosted.org/packages/89/d6/cd8c46417e0f7a16b4b0fc321f4ab676a59250d08fce5b64921897fb07cc +PYTHON_PSYCOPG2_SITE = https://files.pythonhosted.org/packages/c9/5e/dc6acaf46d78979d6b03458b7a1618a68e152a6776fce95daac5e0f0301b PYTHON_PSYCOPG2_SETUP_TYPE = setuptools PYTHON_PSYCOPG2_LICENSE = LGPL-3.0+ PYTHON_PSYCOPG2_LICENSE_FILES = LICENSE From 0bfd7351e1970d03ba692a3ab0207aee4a527dbd Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 23:34:03 -0700 Subject: [PATCH 31/93] package/python-pyasn1-modules: bump to version 0.3.0 Update github url to new repository. License hash changed due to year update: https://github.com/pyasn1/pyasn1-modules/commit/848e7d6a6e8c16d68fb7bedd0715f724ef538b5d Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pyasn1-modules/Config.in | 2 +- package/python-pyasn1-modules/python-pyasn1-modules.hash | 6 +++--- package/python-pyasn1-modules/python-pyasn1-modules.mk | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/python-pyasn1-modules/Config.in b/package/python-pyasn1-modules/Config.in index 6aff4d935b..cb486d33ae 100644 --- a/package/python-pyasn1-modules/Config.in +++ b/package/python-pyasn1-modules/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_PYTHON_PYASN1_MODULES help A collection of ASN.1-based protocols modules. - https://github.com/etingof/pyasn1-modules + https://github.com/pyasn1/pyasn1-modules diff --git a/package/python-pyasn1-modules/python-pyasn1-modules.hash b/package/python-pyasn1-modules/python-pyasn1-modules.hash index 2305596585..6f4bb6faf0 100644 --- a/package/python-pyasn1-modules/python-pyasn1-modules.hash +++ b/package/python-pyasn1-modules/python-pyasn1-modules.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyasn1-modules/json -md5 107e1ece7d0a41d782f69f8a95a4d9bc pyasn1-modules-0.2.8.tar.gz -sha256 905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e pyasn1-modules-0.2.8.tar.gz +md5 94ee572b06ae09f1903b11333575b091 pyasn1_modules-0.3.0.tar.gz +sha256 5bd01446b736eb9d31512a30d46c1ac3395d676c6f3cafa4c03eb54b9925631c pyasn1_modules-0.3.0.tar.gz # Locally computed sha256 checksums -sha256 22c5cc6922ab5d69fba32d8c5ee4cdd14981508cb53afc0ebd85593847fd95a5 LICENSE.txt +sha256 2aad5fc00f705c4a1addb83eed10a6a75d286a3779f0cf8519d87e62bc4735fd LICENSE.txt diff --git a/package/python-pyasn1-modules/python-pyasn1-modules.mk b/package/python-pyasn1-modules/python-pyasn1-modules.mk index 9933a63aa7..41987028fc 100644 --- a/package/python-pyasn1-modules/python-pyasn1-modules.mk +++ b/package/python-pyasn1-modules/python-pyasn1-modules.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYASN1_MODULES_VERSION = 0.2.8 -PYTHON_PYASN1_MODULES_SOURCE = pyasn1-modules-$(PYTHON_PYASN1_MODULES_VERSION).tar.gz -PYTHON_PYASN1_MODULES_SITE = https://files.pythonhosted.org/packages/88/87/72eb9ccf8a58021c542de2588a867dbefc7556e14b2866d1e40e9e2b587e +PYTHON_PYASN1_MODULES_VERSION = 0.3.0 +PYTHON_PYASN1_MODULES_SOURCE = pyasn1_modules-$(PYTHON_PYASN1_MODULES_VERSION).tar.gz +PYTHON_PYASN1_MODULES_SITE = https://files.pythonhosted.org/packages/3b/e4/7dec823b1b5603c5b3c51e942d5d9e65efd6ff946e713a325ed4146d070f PYTHON_PYASN1_MODULES_SETUP_TYPE = setuptools PYTHON_PYASN1_MODULES_LICENSE = BSD-2-Clause PYTHON_PYASN1_MODULES_LICENSE_FILES = LICENSE.txt From 1f096a04de0bb7319fa9f3b58adcf9cc895bbac5 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 23:41:50 -0700 Subject: [PATCH 32/93] package/python-pycairo: bump to version 1.25.1 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pycairo/python-pycairo.hash | 4 ++-- package/python-pycairo/python-pycairo.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pycairo/python-pycairo.hash b/package/python-pycairo/python-pycairo.hash index 98bb7f2802..f44afe6fc4 100644 --- a/package/python-pycairo/python-pycairo.hash +++ b/package/python-pycairo/python-pycairo.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pycairo/json -md5 7a3729d21659098e1b9a411b62e88966 pycairo-1.23.0.tar.gz -sha256 9b61ac818723adc04367301317eb2e814a83522f07bbd1f409af0dada463c44c pycairo-1.23.0.tar.gz +md5 7669cdc70111d01ba6faecd65d8cdbf6 pycairo-1.25.1.tar.gz +sha256 7e2be4fbc3b4536f16db7a11982cbf713e75069a4d73d44fe5a49b68423f5c0c pycairo-1.25.1.tar.gz # Locally computed sha256 checksums sha256 360b9a526d47c51a7cab7f1ec49ca5893050562d639b742d588934ff84823a72 COPYING sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f COPYING-LGPL-2.1 diff --git a/package/python-pycairo/python-pycairo.mk b/package/python-pycairo/python-pycairo.mk index f9933df187..eb60293ff8 100644 --- a/package/python-pycairo/python-pycairo.mk +++ b/package/python-pycairo/python-pycairo.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCAIRO_VERSION = 1.23.0 +PYTHON_PYCAIRO_VERSION = 1.25.1 PYTHON_PYCAIRO_SOURCE = pycairo-$(PYTHON_PYCAIRO_VERSION).tar.gz -PYTHON_PYCAIRO_SITE = https://files.pythonhosted.org/packages/69/ca/9e9fa2e8be0876a9bbf046a1be7ee33e61d4fdfbd1fd25c76c1bdfddf8c4 +PYTHON_PYCAIRO_SITE = https://files.pythonhosted.org/packages/c7/7c/de4d40316ee563e4f15a0f05f28c8458833fbef80c4588b9dd51f39b78ee PYTHON_PYCAIRO_SETUP_TYPE = setuptools PYTHON_PYCAIRO_DEPENDENCIES = cairo PYTHON_PYCAIRO_LICENSE = LGPL-2.1 or MPL-1.1 From bdbaab97701af41f58454800de848c7e70e396b8 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 23:46:31 -0700 Subject: [PATCH 33/93] package/python-pycares: bump to version 4.4.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pycares/python-pycares.hash | 4 ++-- package/python-pycares/python-pycares.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pycares/python-pycares.hash b/package/python-pycares/python-pycares.hash index 7cdd93dd93..fa24c1ec66 100644 --- a/package/python-pycares/python-pycares.hash +++ b/package/python-pycares/python-pycares.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pycares/json -md5 d11b196cebb45a38caa56e850f4a60d9 pycares-4.3.0.tar.gz -sha256 c542696f6dac978e9d99192384745a65f80a7d9450501151e4a7563e06010d45 pycares-4.3.0.tar.gz +md5 ff4e54e91e32484b189b1e28758ec8c7 pycares-4.4.0.tar.gz +sha256 f47579d508f2f56eddd16ce72045782ad3b1b3b678098699e2b6a1b30733e1c2 pycares-4.4.0.tar.gz # Locally computed sha256 checksums sha256 427bb3a5372024a26e2c290b24382512bcc7ca123431c4dd178dd613beea7eee LICENSE diff --git a/package/python-pycares/python-pycares.mk b/package/python-pycares/python-pycares.mk index b1c7dcef50..fe6916445d 100644 --- a/package/python-pycares/python-pycares.mk +++ b/package/python-pycares/python-pycares.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCARES_VERSION = 4.3.0 +PYTHON_PYCARES_VERSION = 4.4.0 PYTHON_PYCARES_SOURCE = pycares-$(PYTHON_PYCARES_VERSION).tar.gz -PYTHON_PYCARES_SITE = https://files.pythonhosted.org/packages/01/50/e3015e6e03a3cf64113f509e8b86b71af37169b59ccedfcb182f3d031329 +PYTHON_PYCARES_SITE = https://files.pythonhosted.org/packages/1b/8f/daf60bbc06f4a3cd1cfb0ab807057151287df6f5c78f2e0d298acc9193ac PYTHON_PYCARES_SETUP_TYPE = setuptools PYTHON_PYCARES_LICENSE = MIT PYTHON_PYCARES_LICENSE_FILES = LICENSE From ecc9da527794cf6a1b09e132412350376349d2d5 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 23:56:53 -0700 Subject: [PATCH 34/93] package/python-pycrate: bump to version 0.7.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pycrate/python-pycrate.hash | 4 ++-- package/python-pycrate/python-pycrate.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pycrate/python-pycrate.hash b/package/python-pycrate/python-pycrate.hash index fd41274369..94ec99b738 100644 --- a/package/python-pycrate/python-pycrate.hash +++ b/package/python-pycrate/python-pycrate.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pycrate/json -md5 d51fd27d99481990ff85a1e418b1c938 pycrate-0.6.0.tar.gz -sha256 b49738c02a3f93ba9f76c0dac82b689a5341882814b36c714e9600e9f560daf7 pycrate-0.6.0.tar.gz +md5 bd21fa697ecff7ad93bec4943230d281 pycrate-0.7.0.tar.gz +sha256 c83232f522b5bbc3b3eeaca2cf38ee63cd3c25d0c15f3ba221e6dafa89b9a763 pycrate-0.7.0.tar.gz # Locally computed sha256 checksums sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 license.txt diff --git a/package/python-pycrate/python-pycrate.mk b/package/python-pycrate/python-pycrate.mk index 2f947ab807..1645eaf52c 100644 --- a/package/python-pycrate/python-pycrate.mk +++ b/package/python-pycrate/python-pycrate.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCRATE_VERSION = 0.6.0 +PYTHON_PYCRATE_VERSION = 0.7.0 PYTHON_PYCRATE_SOURCE = pycrate-$(PYTHON_PYCRATE_VERSION).tar.gz -PYTHON_PYCRATE_SITE = https://files.pythonhosted.org/packages/fb/7f/5f354100270a5d41350e9806dc9950a33e00a30eb3a7ab5fc9db86326856 +PYTHON_PYCRATE_SITE = https://files.pythonhosted.org/packages/a6/a5/aab94e6bb8b3281cc450dde3961b417bd56abde2401955a9a4904df44c68 PYTHON_PYCRATE_SETUP_TYPE = setuptools PYTHON_PYCRATE_EXTRA_DOWNLOADS = https://raw.githubusercontent.com/P1sec/pycrate/$(PYTHON_PYCRATE_VERSION)/license.txt PYTHON_PYCRATE_LICENSE = LGPL-2.1+ From 66f94d372fce75240cceadeb1bdc738297cfb8fc Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 25 Nov 2023 00:02:38 -0700 Subject: [PATCH 35/93] package/python-pycryptodomex: bump to version 3.19.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- 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 954f4a8938..2b74e03e76 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 3b8d868cef13ea41cb3bfeab66a7707c pycryptodomex-3.18.0.tar.gz -sha256 3e3ecb5fe979e7c1bb0027e518340acf7ee60415d79295e5251d13c68dde576e pycryptodomex-3.18.0.tar.gz +md5 0dc96e1ffb42c955d89c2ce3f3875c9c pycryptodomex-3.19.0.tar.gz +sha256 af83a554b3f077564229865c45af0791be008ac6469ef0098152139e6bd4b5b6 pycryptodomex-3.19.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 d6eb2a9513..0d9855c602 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCRYPTODOMEX_VERSION = 3.18.0 +PYTHON_PYCRYPTODOMEX_VERSION = 3.19.0 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/40/92/efd675dba957315d705f792b28d900bddc36f39252f6713961b4221ee9af +PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/14/c9/09d5df04c9f29ae1b49d0e34c9934646b53bb2131a55e8ed2a0d447c7c53 PYTHON_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ From 618ad13422197e3ad18893bc034a11d4b4d0f6c6 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 25 Nov 2023 00:07:06 -0700 Subject: [PATCH 36/93] package/python-pydal: bump to version 20231114.3 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pydal/python-pydal.hash | 4 ++-- package/python-pydal/python-pydal.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pydal/python-pydal.hash b/package/python-pydal/python-pydal.hash index 8ed25084d1..9f2ab55508 100644 --- a/package/python-pydal/python-pydal.hash +++ b/package/python-pydal/python-pydal.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pydal/json -md5 47f0425745bcd1bb413aa9208cd06b3c pydal-20230521.1.tar.gz -sha256 10478a61e627c5b8cb7691f7f7ebf7210845485316493d37d740c297fb6d1845 pydal-20230521.1.tar.gz +md5 b2072b7b000223890b56830ca1ab3616 pydal-20231114.3.tar.gz +sha256 c42d16fca9e3bb6d399aefb2434c0e70862ee13c75437852f421920432ee5fb1 pydal-20231114.3.tar.gz # Locally computed sha256 checksums sha256 1f711e93f1e0c2eec576e2e60597dc2ed6f0a661e4749c6b8a39f0d4a72be468 LICENSE.txt diff --git a/package/python-pydal/python-pydal.mk b/package/python-pydal/python-pydal.mk index 1cc7e90b11..245383f244 100644 --- a/package/python-pydal/python-pydal.mk +++ b/package/python-pydal/python-pydal.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDAL_VERSION = 20230521.1 +PYTHON_PYDAL_VERSION = 20231114.3 PYTHON_PYDAL_SOURCE = pydal-$(PYTHON_PYDAL_VERSION).tar.gz -PYTHON_PYDAL_SITE = https://files.pythonhosted.org/packages/68/b4/15dc227f965cc0525ca7f432368706cc4087ad6d587a5a05b251d133023e +PYTHON_PYDAL_SITE = https://files.pythonhosted.org/packages/0b/3b/86302e165af07bc3d9225aea6ed8f52386270220e4aac1aad0101a48aac1 PYTHON_PYDAL_LICENSE = BSD-3-Clause PYTHON_PYDAL_LICENSE_FILES = LICENSE.txt PYTHON_PYDAL_SETUP_TYPE = setuptools From 20af13d17f404c9d56d7274046358c2242524248 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 25 Nov 2023 01:15:08 -0700 Subject: [PATCH 37/93] package/python-pydyf: bump to version 0.8.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pydyf/python-pydyf.hash | 4 ++-- package/python-pydyf/python-pydyf.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pydyf/python-pydyf.hash b/package/python-pydyf/python-pydyf.hash index 4e52429dfe..b2dac04516 100644 --- a/package/python-pydyf/python-pydyf.hash +++ b/package/python-pydyf/python-pydyf.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pydyf/json -md5 52a772655c1398e7b60d22e930e13094 pydyf-0.7.0.tar.gz -sha256 a5a88cb06e5beb64a1ef2147ee879b0e5139f5fdb827fda2fcf14a018c7b11e6 pydyf-0.7.0.tar.gz +md5 a3650927d9a84da1dc0aa1d268f21376 pydyf-0.8.0.tar.gz +sha256 b22b1ef016141b54941ad66ed4e036a7bdff39c0b360993b283875c3f854dd9a pydyf-0.8.0.tar.gz # Locally computed sha256 checksums sha256 75461e438973e1ba0f93a7de9e3fe5b2f49e1ab49251d392878a9cdae8ce7e47 LICENSE diff --git a/package/python-pydyf/python-pydyf.mk b/package/python-pydyf/python-pydyf.mk index d941a00a9f..e9b7d229c7 100644 --- a/package/python-pydyf/python-pydyf.mk +++ b/package/python-pydyf/python-pydyf.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDYF_VERSION = 0.7.0 +PYTHON_PYDYF_VERSION = 0.8.0 PYTHON_PYDYF_SOURCE = pydyf-$(PYTHON_PYDYF_VERSION).tar.gz -PYTHON_PYDYF_SITE = https://files.pythonhosted.org/packages/28/ec/b6b327f2a249a83022501b2f57844ca05b2b26e0cadf28648ea5c0f72aa6 +PYTHON_PYDYF_SITE = https://files.pythonhosted.org/packages/18/dc/b607bbc7c15327c5d5ec25681a3707c847906134925d21a26ec6e7416a4a PYTHON_PYDYF_SETUP_TYPE = flit PYTHON_PYDYF_LICENSE = BSD-3-Clause PYTHON_PYDYF_LICENSE_FILES = LICENSE From efb5d3fbd888549cdd2370240bfb2969afed2bb4 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 25 Nov 2023 01:22:08 -0700 Subject: [PATCH 38/93] package/python-pyelftools: bump to version 0.30 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pyelftools/python-pyelftools.hash | 4 ++-- package/python-pyelftools/python-pyelftools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyelftools/python-pyelftools.hash b/package/python-pyelftools/python-pyelftools.hash index 7cffe2d646..70af8104b9 100644 --- a/package/python-pyelftools/python-pyelftools.hash +++ b/package/python-pyelftools/python-pyelftools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyelftools/json -md5 2afc97cd239c0dea0cca97d00d3dcb42 pyelftools-0.29.tar.gz -sha256 ec761596aafa16e282a31de188737e5485552469ac63b60cfcccf22263fd24ff pyelftools-0.29.tar.gz +md5 2b4f82fd30436834b9357a5e74b8ceb7 pyelftools-0.30.tar.gz +sha256 2fc92b0d534f8b081f58c7c370967379123d8e00984deb53c209364efd575b40 pyelftools-0.30.tar.gz # Locally computed sha256 checksums sha256 ae18bf4cb82f92af7547259177bc28bc48e4fc732518bcedfe690226288d3445 LICENSE diff --git a/package/python-pyelftools/python-pyelftools.mk b/package/python-pyelftools/python-pyelftools.mk index 7566f24895..0e52c0b885 100644 --- a/package/python-pyelftools/python-pyelftools.mk +++ b/package/python-pyelftools/python-pyelftools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYELFTOOLS_VERSION = 0.29 +PYTHON_PYELFTOOLS_VERSION = 0.30 PYTHON_PYELFTOOLS_SOURCE = pyelftools-$(PYTHON_PYELFTOOLS_VERSION).tar.gz -PYTHON_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/0e/35/e76da824595452a5ad07f289ea1737ca0971fc6cc7b6ee9464279be06b5e +PYTHON_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/84/05/fd41cd647de044d1ffec90ce5aaae935126ac217f8ecb302186655284fc8 PYTHON_PYELFTOOLS_LICENSE = Public domain PYTHON_PYELFTOOLS_LICENSE_FILES = LICENSE PYTHON_PYELFTOOLS_SETUP_TYPE = setuptools From e241419490c80cb0b758dc017ffe8f7b95533890 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 25 Nov 2023 00:34:18 -0700 Subject: [PATCH 39/93] utils/scanpypi: add flit package support These packages don't have a setup.py so we instead need to parse their pyproject.toml file. It is possible that such a package does not define a project_urls config item, so ensure we do not choke on it (None.get() would raise). Note that this currently doesn't handle flit package dependency resolution. Signed-off-by: James Hilliard Reviewed-by: Yegor Yefremov [yann.morin.1998@free.fr: - add sentence about the project_urls rewrite - fix flake8 errors ] Signed-off-by: Yann E. MORIN --- utils/scanpypi | 94 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 90 insertions(+), 4 deletions(-) diff --git a/utils/scanpypi b/utils/scanpypi index 3c98bb4bcc..021c99a172 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -43,6 +43,56 @@ except ImportError: liclookup = None +def toml_load(f): + with open(f, 'rb') as fh: + ex = None + + # Try standard library tomllib first + try: + from tomllib import load + return load(fh) + except ImportError: + pass + + # Try regular tomli next + try: + from tomli import load + return load(fh) + except ImportError as e: + ex = e + + # Try pip's vendored tomli + try: + from pip._vendor.tomli import load + try: + return load(fh) + except TypeError: + # Fallback to handle older version + try: + fh.seek(0) + w = io.TextIOWrapper(fh, encoding="utf8", newline="") + return load(w) + finally: + w.detach() + except ImportError: + pass + + # Try regular toml last + try: + from toml import load + fh.seek(0) + w = io.TextIOWrapper(fh, encoding="utf8", newline="") + try: + return load(w) + finally: + w.detach() + except ImportError: + pass + + print('This package needs tomli') + raise ex + + def setup_decorator(func, method): """ Decorator for distutils.core.setup and setuptools.setup. @@ -316,6 +366,35 @@ class BuildrootPackage(): os.chdir(current_dir) sys.path.remove(self.tmp_extract) + def load_pyproject(self): + """ + Loads the corresponding pyproject.toml and store its metadata + """ + current_dir = os.getcwd() + os.chdir(self.tmp_extract) + sys.path.insert(0, self.tmp_extract) + try: + pyproject_data = toml_load('pyproject.toml') + try: + self.setup_metadata = pyproject_data.get('project', {}) + self.metadata_name = self.setup_metadata.get('name', self.real_name) + build_system = pyproject_data.get('build-system', {}) + build_backend = build_system.get('build-backend', None) + if build_backend and build_backend == 'flit_core.buildapi': + self.setup_metadata['method'] = 'flit' + elif build_system.get('backend-path', None): + self.setup_metadata['method'] = 'pep517' + else: + self.setup_metadata['method'] = 'unknown' + except KeyError: + print('ERROR: Could not determine package metadata for {pkg}.\n' + .format(pkg=self.real_name)) + raise + except FileNotFoundError: + raise + os.chdir(current_dir) + sys.path.remove(self.tmp_extract) + def get_requirements(self, pkg_folder): """ Retrieve dependencies from the metadata found in the setup.py script of @@ -620,8 +699,12 @@ class BuildrootPackage(): if help_lines[-1][-1] != '.': help_lines[-1] += '.' - home_page = md_info.get('home_page', None) or \ - md_info.get('project_urls', {}).get('Homepage', None) # noqa: E127 + home_page = md_info.get('home_page', None) + + if not home_page: + project_urls = md_info.get('project_urls', None) + if project_urls: + home_page = project_urls.get('Homepage', None) if home_page: # \t + two spaces is 3 char long @@ -699,9 +782,12 @@ def main(): except ImportError as err: if 'buildutils' in str(err): print('This package needs buildutils') + continue else: - raise - continue + try: + package.load_pyproject() + except Exception: + raise except (AttributeError, KeyError) as error: print('Error: Could not install package {pkg}: {error}'.format( pkg=package.real_name, error=error)) From 0ff5d3df052d9a1594db05360e301c7614ca68f2 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 1 Oct 2023 00:16:25 +0200 Subject: [PATCH 40/93] package/pkg-python.mk: remove $(2)_PYTHON_INTERPRETER variable This is a leftover from python 2/3. Since the interpreter is now always python3, we can simply call it like that - like is done in all the other places where python is called. While we're at it, call python3 explicitly rather than relying on the symlink. Signed-off-by: Arnout Vandecappelle Signed-off-by: Yann E. MORIN --- package/pkg-python.mk | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 28ee4cb85f..1fc096efb3 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -325,10 +325,6 @@ $(2)_DOWNLOAD_POST_PROCESS = cargo $(2)_DOWNLOAD_DEPENDENCIES = host-rustc endif # SETUP_TYPE -# Python interpreter to use for building the package. -# -$(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/python - # # Build step. Only define it if not already defined by the package .mk # file. @@ -337,7 +333,7 @@ ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) \ + $$(HOST_DIR)/bin/python3 \ $$($$(PKG)_BASE_BUILD_CMD) \ $$($$(PKG)_BASE_BUILD_OPTS) $$($$(PKG)_BUILD_OPTS)) endef @@ -351,7 +347,7 @@ ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) \ + $$(HOST_DIR)/bin/python3 \ $$($$(PKG)_BASE_INSTALL_CMD) \ $$($$(PKG)_INSTALL_OPTS)) endef @@ -365,7 +361,7 @@ ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) \ + $$(HOST_DIR)/bin/python3 \ $$($$(PKG)_BASE_INSTALL_TARGET_CMD) \ $$($$(PKG)_INSTALL_TARGET_OPTS)) endef @@ -379,7 +375,7 @@ ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) \ + $$(HOST_DIR)/bin/python3 \ $$($$(PKG)_BASE_INSTALL_STAGING_CMD) \ $$($$(PKG)_INSTALL_STAGING_OPTS)) endef From ba27abf3566a86ecf2f89c7a4bb1d2c6a50eda89 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 1 Oct 2023 00:16:26 +0200 Subject: [PATCH 41/93] package/pkg-python.mk: remove _BASE_BUILD_OPTS variable This variable can just as well be merged into _BASE_BUILD_CMD. This is how it's done for the install opts. And anyway it's only used by distutils and nowhere else. Signed-off-by: Arnout Vandecappelle Signed-off-by: Yann E. MORIN --- package/pkg-python.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 1fc096efb3..eacf75c165 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -198,8 +198,7 @@ endif ifeq ($$($(2)_SETUP_TYPE),distutils) ifeq ($(4),target) $(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_BUILD_CMD = setup.py build $$(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 @@ -335,7 +334,7 @@ define $(2)_BUILD_CMDS $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ $$(HOST_DIR)/bin/python3 \ $$($$(PKG)_BASE_BUILD_CMD) \ - $$($$(PKG)_BASE_BUILD_OPTS) $$($$(PKG)_BUILD_OPTS)) + $$($$(PKG)_BUILD_OPTS)) endef endif From aae25fb55e13198cfabbcbd7e561767d337c0407 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 1 Oct 2023 00:16:27 +0200 Subject: [PATCH 42/93] package/pkg-python.mk: split the commands in a target and host section Only define the _CMDS variables that are relevant for the target resp. host variant. Duplicate the _BUILD_CMDS. This will allow us to differentiate part of the _BUILD_CMDS definition in a follow-up patch. Signed-off-by: Arnout Vandecappelle Signed-off-by: Yann E. MORIN --- package/pkg-python.mk | 47 ++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index eacf75c165..c1640d71bb 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -324,6 +324,7 @@ $(2)_DOWNLOAD_POST_PROCESS = cargo $(2)_DOWNLOAD_DEPENDENCIES = host-rustc endif # SETUP_TYPE +ifeq ($(4),target) # # Build step. Only define it if not already defined by the package .mk # file. @@ -338,20 +339,6 @@ define $(2)_BUILD_CMDS endef endif -# -# Host installation step. Only define it if not already defined by the -# package .mk file. -# -ifndef $(2)_INSTALL_CMDS -define $(2)_INSTALL_CMDS - (cd $$($$(PKG)_BUILDDIR)/; \ - $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$(HOST_DIR)/bin/python3 \ - $$($$(PKG)_BASE_INSTALL_CMD) \ - $$($$(PKG)_INSTALL_OPTS)) -endef -endif - # # Target installation step. Only define it if not already defined by # the package .mk file. @@ -380,6 +367,38 @@ define $(2)_INSTALL_STAGING_CMDS endef endif +else # host + +# +# Host build step. Only define it if not already defined by the package .mk +# file. +# +ifndef $(2)_BUILD_CMDS +define $(2)_BUILD_CMDS + (cd $$($$(PKG)_BUILDDIR)/; \ + $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ + $$(HOST_DIR)/bin/python3 \ + $$($$(PKG)_BASE_BUILD_CMD) \ + $$($$(PKG)_BUILD_OPTS)) +endef +endif + +# +# Host installation step. Only define it if not already defined by the +# package .mk file. +# +ifndef $(2)_INSTALL_CMDS +define $(2)_INSTALL_CMDS + (cd $$($$(PKG)_BUILDDIR)/; \ + $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ + $$(HOST_DIR)/bin/python3 \ + $$($$(PKG)_BASE_INSTALL_CMD) \ + $$($$(PKG)_INSTALL_OPTS)) +endef +endif + +endif # host / target + # Call the generic package infrastructure to generate the necessary # make targets $(call inner-generic-package,$(1),$(2),$(3),$(4)) From 9e447e8b2fdf94bed898208f69c2acf7a1856df0 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 1 Oct 2023 00:16:28 +0200 Subject: [PATCH 43/93] package/pkg-python.mk: replace $(_BASE_ENV) with $($(SETUP_TYPE)_ENV) The _BASE_ENV variable is set based on the setup type, and only based on the setup type. Because of this, we have a large conditional tree in inner-python-package which makes things hard to read. Rather than conditions, it's also possible to use indirect variables. Concretely, we can use $(PKG_PYTHON_$($(PKG)_SETUP_TYPE)_ENV) instead of $($(PKG)_BASE_ENV) to dispatch to the right ENV variable. Once we do the same for all other variables that are set in the condition tree, we'll be able to remove the condition tree entirely. Because $($(PKG)_SETUP_TYPE) is lowercase (e.g. 'setuptools' or 'pep517'), while the existing _ENV variables have uppercase names (e.g. PKG_PYTHON_SETUPTOOLS_ENV), we need to convert the setup type to uppercase. Introduce the variable $(PKG)_SETUP_TYPE_UPPER for this. flit was reusing the _BASE_ENV definition from pep517, and flit-bootstrap also didn't have its own _ENV definition yet, so those have to be added. Signed-off-by: Arnout Vandecappelle Signed-off-by: Yann E. MORIN --- package/pkg-python.mk | 52 ++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index c1640d71bb..8e8955f3c4 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -158,6 +158,18 @@ HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS = \ --installdir=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages +# Target flit packages +PKG_PYTHON_FLIT_ENV = \ + $(PKG_PYTHON_PEP517_ENV) + +# Host flit packages +HOST_PKG_PYTHON_FLIT_ENV = \ + $(HOST_PKG_PYTHON_PEP517_ENV) + +# Host flit-bootstrap packages +HOST_PKG_PYTHON_FLIT_BOOTSTRAP_ENV = \ + $(HOST_PKG_PYTHON_PEP517_ENV) + # Target maturin packages PKG_PYTHON_MATURIN_ENV = \ $(PKG_PYTHON_PEP517_ENV) \ @@ -194,54 +206,34 @@ ifndef $(2)_SETUP_TYPE endif endif +$(2)_SETUP_TYPE_UPPER = $$(call UPPERCASE,$$($(2)_SETUP_TYPE)) + # Distutils ifeq ($$($(2)_SETUP_TYPE),distutils) ifeq ($(4),target) -$(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV) $(2)_BASE_BUILD_CMD = setup.py build $$(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_CMD = setup.py build $(2)_BASE_INSTALL_CMD = setup.py install $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS) endif # Setuptools else ifneq ($$(filter setuptools setuptools-rust,$$($(2)_SETUP_TYPE)),) ifeq ($(4),target) -ifeq ($$($(2)_SETUP_TYPE),setuptools-rust) -$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_RUST_ENV) -else -$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV) -endif $(2)_BASE_BUILD_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) build $(2)_BASE_INSTALL_TARGET_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) install --no-compile $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) $(2)_BASE_INSTALL_STAGING_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) install $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS) else -ifeq ($$($(2)_SETUP_TYPE),setuptools-rust) -$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_RUST_ENV) -else -$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) -endif $(2)_BASE_BUILD_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) build $(2)_BASE_INSTALL_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) install $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) endif else ifneq ($$(filter flit maturin pep517,$$($(2)_SETUP_TYPE)),) ifeq ($(4),target) -ifeq ($$($(2)_SETUP_TYPE),maturin) -$(2)_BASE_ENV = $$(PKG_PYTHON_MATURIN_ENV) -else -$(2)_BASE_ENV = $$(PKG_PYTHON_PEP517_ENV) -endif $(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 -ifeq ($$($(2)_SETUP_TYPE),maturin) -$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_MATURIN_ENV) -else -$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) -endif $(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 @@ -249,7 +241,6 @@ else ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) ifeq ($(4),target) $$(error flit-bootstrap setup type only supported for host packages) else -$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) $(2)_BASE_BUILD_CMD = -m flit_core.wheel $(2)_BASE_INSTALL_CMD ?= $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) endif @@ -332,7 +323,8 @@ ifeq ($(4),target) ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ - $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ + $$(PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_ENV) \ + $$($$(PKG)_ENV) \ $$(HOST_DIR)/bin/python3 \ $$($$(PKG)_BASE_BUILD_CMD) \ $$($$(PKG)_BUILD_OPTS)) @@ -346,7 +338,8 @@ endif ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ - $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ + $$(PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_ENV) \ + $$($$(PKG)_ENV) \ $$(HOST_DIR)/bin/python3 \ $$($$(PKG)_BASE_INSTALL_TARGET_CMD) \ $$($$(PKG)_INSTALL_TARGET_OPTS)) @@ -360,7 +353,8 @@ endif ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ - $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ + $$(PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_ENV) \ + $$($$(PKG)_ENV) \ $$(HOST_DIR)/bin/python3 \ $$($$(PKG)_BASE_INSTALL_STAGING_CMD) \ $$($$(PKG)_INSTALL_STAGING_OPTS)) @@ -376,7 +370,8 @@ else # host ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ - $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ + $$(HOST_PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_ENV) \ + $$($$(PKG)_ENV) \ $$(HOST_DIR)/bin/python3 \ $$($$(PKG)_BASE_BUILD_CMD) \ $$($$(PKG)_BUILD_OPTS)) @@ -390,7 +385,8 @@ endif ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ - $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ + $$(HOST_PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_ENV) \ + $$($$(PKG)_ENV) \ $$(HOST_DIR)/bin/python3 \ $$($$(PKG)_BASE_INSTALL_CMD) \ $$($$(PKG)_INSTALL_OPTS)) From b28b95d1e4087e7569522565a8327f45f39e11de Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 1 Oct 2023 00:16:29 +0200 Subject: [PATCH 44/93] package/pkg-python.mk: replace $(_BASE_BUILD_CMD) with $($(SETUP_TYPE)_BUILD_CMD) The _BASE_BUILD_CMD variable is set based on the setup type, and only based on the setup type. Because of this, we have a large conditional tree in inner-python-package which makes things hard to read. Rather than conditions, it's also possible to use indirect variables. Concretely, we can define PKG_PYTHON_DISTUTILS_BUILD_CMD etc., and use $(PKG_PYTHON_$($(PKG)_SETUP_TYPE)_BUILD_CMD) instead of $($(PKG)_BASE_BUILD_CMD) to dispatch to the right _BUILD_CMD variable. Once we do the same for all other variables that are set in the condition tree, we'll be able to remove the condition tree entirely. setuptools-rust, flit and maturin didn't have their own definition of _BUILD_CMD but were under the setuptools resp. pep517 condition. For these, we have to define new variables that copy the value from PKG_PYTHON_SETUPTOOLS_BUILD_CMD resp. PKG_PYTHON_PEP517_BUILD_CMD. Signed-off-by: Arnout Vandecappelle Signed-off-by: Yann E. MORIN --- package/pkg-python.mk | 50 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 40 insertions(+), 10 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 8e8955f3c4..5f8ef14262 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -57,7 +57,8 @@ PKG_PYTHON_DISTUTILS_ENV = \ $(PKG_PYTHON_ENV) \ LDSHARED="$(TARGET_CROSS)gcc -shared" -PKG_PYTHON_DISTUTILS_BUILD_OPTS = \ +PKG_PYTHON_DISTUTILS_BUILD_CMD = \ + setup.py build \ --executable=/usr/bin/python PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ @@ -76,6 +77,9 @@ PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ HOST_PKG_PYTHON_DISTUTILS_ENV = \ $(HOST_PKG_PYTHON_ENV) +HOST_PKG_PYTHON_DISTUTILS_BUILD_CMD = \ + setup.py build \ + HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ --prefix=$(HOST_DIR) @@ -86,6 +90,9 @@ PKG_PYTHON_SETUPTOOLS_ENV = \ PKG_PYTHON_SETUPTOOLS_CMD = \ $(if $(wildcard $($(PKG)_BUILDDIR)/setup.py),setup.py,-c 'from setuptools import setup;setup()') +PKG_PYTHON_SETUPTOOLS_BUILD_CMD = \ + $(PKG_PYTHON_SETUPTOOLS_CMD) build + PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --prefix=/usr \ @@ -104,6 +111,9 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ $(HOST_PKG_PYTHON_ENV) +HOST_PKG_PYTHON_SETUPTOOLS_BUILD_CMD = \ + $(PKG_PYTHON_SETUPTOOLS_CMD) build + HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --prefix=$(HOST_DIR) \ --root=/ \ @@ -115,16 +125,25 @@ PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ $(PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" +PKG_PYTHON_SETUPTOOLS_RUST_BUILD_CMD = \ + $(PKG_PYTHON_SETUPTOOLS_BUILD_CMD) + # Host setuptools-rust-based packages HOST_PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ $(HOST_PKG_PYTHON_SETUPTOOLS_ENV) \ $(HOST_PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)" +HOST_PKG_PYTHON_SETUPTOOLS_RUST_BUILD_CMD = \ + $(HOST_PKG_PYTHON_SETUPTOOLS_BUILD_CMD) + # Target pep517-based packages PKG_PYTHON_PEP517_ENV = \ $(PKG_PYTHON_ENV) +PKG_PYTHON_PEP517_BUILD_CMD = \ + -m build -n -w + PKG_PYTHON_PEP517_INSTALL_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix @@ -147,6 +166,9 @@ PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ HOST_PKG_PYTHON_PEP517_ENV = \ $(HOST_PKG_PYTHON_ENV) +HOST_PKG_PYTHON_PEP517_BUILD_CMD = \ + -m build -n -w + HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ --interpreter=$(HOST_DIR)/bin/python \ --script-kind=posix \ @@ -162,26 +184,41 @@ HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS = \ PKG_PYTHON_FLIT_ENV = \ $(PKG_PYTHON_PEP517_ENV) +PKG_PYTHON_FLIT_BUILD_CMD = \ + $(PKG_PYTHON_PEP517_BUILD_CMD) + # Host flit packages HOST_PKG_PYTHON_FLIT_ENV = \ $(HOST_PKG_PYTHON_PEP517_ENV) +HOST_PKG_PYTHON_FLIT_BUILD_CMD = \ + $(HOST_PKG_PYTHON_PEP517_BUILD_CMD) + # Host flit-bootstrap packages HOST_PKG_PYTHON_FLIT_BOOTSTRAP_ENV = \ $(HOST_PKG_PYTHON_PEP517_ENV) +HOST_PKG_PYTHON_FLIT_BOOTSTRAP_BUILD_CMD = \ + -m flit_core.wheel + # Target maturin packages PKG_PYTHON_MATURIN_ENV = \ $(PKG_PYTHON_PEP517_ENV) \ $(PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" +PKG_PYTHON_MATURIN_BUILD_CMD = \ + $(PKG_PYTHON_PEP517_BUILD_CMD) + # Host maturin packages HOST_PKG_PYTHON_MATURIN_ENV = \ $(HOST_PKG_PYTHON_PEP517_ENV) \ $(HOST_PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)" +HOST_PKG_PYTHON_MATURIN_BUILD_CMD = \ + $(HOST_PKG_PYTHON_PEP517_BUILD_CMD) + ################################################################################ # inner-python-package -- defines how the configuration, compilation # and installation of a Python package should be done, implements a @@ -211,37 +248,30 @@ $(2)_SETUP_TYPE_UPPER = $$(call UPPERCASE,$$($(2)_SETUP_TYPE)) # Distutils ifeq ($$($(2)_SETUP_TYPE),distutils) ifeq ($(4),target) -$(2)_BASE_BUILD_CMD = setup.py build $$(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_BUILD_CMD = setup.py build $(2)_BASE_INSTALL_CMD = setup.py install $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS) endif # Setuptools else ifneq ($$(filter setuptools setuptools-rust,$$($(2)_SETUP_TYPE)),) ifeq ($(4),target) -$(2)_BASE_BUILD_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) build $(2)_BASE_INSTALL_TARGET_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) install --no-compile $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) $(2)_BASE_INSTALL_STAGING_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) install $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS) else -$(2)_BASE_BUILD_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) build $(2)_BASE_INSTALL_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) install $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) endif else ifneq ($$(filter flit maturin pep517,$$($(2)_SETUP_TYPE)),) ifeq ($(4),target) -$(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_BUILD_CMD = -m build -n -w $(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) endif else ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) ifeq ($(4),target) $$(error flit-bootstrap setup type only supported for host packages) else -$(2)_BASE_BUILD_CMD = -m flit_core.wheel $(2)_BASE_INSTALL_CMD ?= $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) endif else @@ -326,7 +356,7 @@ define $(2)_BUILD_CMDS $$(PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_ENV) \ $$($$(PKG)_ENV) \ $$(HOST_DIR)/bin/python3 \ - $$($$(PKG)_BASE_BUILD_CMD) \ + $$(PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_BUILD_CMD) \ $$($$(PKG)_BUILD_OPTS)) endef endif @@ -373,7 +403,7 @@ define $(2)_BUILD_CMDS $$(HOST_PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_ENV) \ $$($$(PKG)_ENV) \ $$(HOST_DIR)/bin/python3 \ - $$($$(PKG)_BASE_BUILD_CMD) \ + $$(HOST_PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_BUILD_CMD) \ $$($$(PKG)_BUILD_OPTS)) endef endif From 906a9fb98972683c8db3820c073ddaa0a0218212 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 1 Oct 2023 00:16:30 +0200 Subject: [PATCH 45/93] package/python-flit-core: instantiate _INSTALL_CMDS host-python-flit-core is the only package that overrides _BASE_INSTALL_CMD. Since we're going to remove that variable in a follow-up patch, we no longer will be able to do that. Since host-python-flit-core is really a special case, it makes sense to define HOST_PYTHON_FLIT_CORE_INSTALL_CMDS in its entirety. While we're at it, also instantiate HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS directly there. This variable is not used anywhere else, and it's a bit confusing to have it in pkg-python.mk - it looks like a mistake. Signed-off-by: Arnout Vandecappelle Signed-off-by: Yann E. MORIN --- package/pkg-python.mk | 3 --- package/python-flit-core/python-flit-core.mk | 9 +++++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 5f8ef14262..be9756acc4 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -177,9 +177,6 @@ HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ --scripts=$(HOST_DIR)/bin \ --data=$(HOST_DIR) -HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS = \ - --installdir=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages - # Target flit packages PKG_PYTHON_FLIT_ENV = \ $(PKG_PYTHON_PEP517_ENV) diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk index ea887a0258..34e58d03ca 100644 --- a/package/python-flit-core/python-flit-core.mk +++ b/package/python-flit-core/python-flit-core.mk @@ -13,7 +13,12 @@ PYTHON_FLIT_CORE_SETUP_TYPE = flit-bootstrap # Use flit built in bootstrap_install for installing host-python-flit-core. # This is due to host-python-installer depending on host-python-flit-core. -# -HOST_PYTHON_FLIT_CORE_BASE_INSTALL_CMD = -m bootstrap_install dist/* $(HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS) +define HOST_PYTHON_FLIT_CORE_INSTALL_CMDS + cd $($(PKG)_BUILDDIR)/; \ + $(HOST_PKG_PYTHON_FLIT_BOOTSTRAP_ENV) \ + $(HOST_DIR)/bin/python3 \ + -m bootstrap_install dist/* \ + --installdir=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages +endef $(eval $(host-python-package)) From fde20964c71202589568d84de0c3bb4c3d6e9b17 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 25 Nov 2023 21:23:13 +0100 Subject: [PATCH 46/93] package/jailhouse: move conditional build/install to macro The usual way of having conditional build and installation of parts of a generic-package, is to conditionally define macros that do that build and installation, and unconditionally expand the macros in the _BUILD_CMDS and _INSTALL_CMDS. Do that in jailhouse, which used to use an ad-hoc conditional block directly in _BUILD_CMDS and _INSTALL_CMDS. Signed-off-by: Yann E. MORIN --- package/jailhouse/jailhouse.mk | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/package/jailhouse/jailhouse.mk b/package/jailhouse/jailhouse.mk index 6356c5a7aa..913be765bd 100644 --- a/package/jailhouse/jailhouse.mk +++ b/package/jailhouse/jailhouse.mk @@ -30,11 +30,26 @@ JAILHOUSE_MAKE_OPTS += \ PYTHON_PIP_USABLE="no" endif +ifeq ($(BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS),y) +define JAILHOUSE_BUILD_HELPER_SCRIPTS + cd $(@D) && \ + $(PKG_PYTHON_SETUPTOOLS_ENV) \ + $(HOST_DIR)/bin/python setup.py \ + build +endef +define JAILHOUSE_INSTALL_HELPER_SCRIPTS + cd $(@D) && \ + $(PKG_PYTHON_SETUPTOOLS_ENV) \ + $(HOST_DIR)/bin/python setup.py \ + install --no-compile \ + $(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) +endef +endif + define JAILHOUSE_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(JAILHOUSE_MAKE_OPTS) -C $(@D) - $(if $(BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS), \ - cd $(@D) && $(PKG_PYTHON_SETUPTOOLS_ENV) $(HOST_DIR)/bin/python setup.py build) + $(JAILHOUSE_BUILD_HELPER_SCRIPTS) endef define JAILHOUSE_INSTALL_TARGET_CMDS @@ -47,8 +62,7 @@ define JAILHOUSE_INSTALL_TARGET_CMDS $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/libexec/jailhouse/demos $(INSTALL) -D -m 0755 $(@D)/inmates/demos/*/*.bin $(TARGET_DIR)/usr/local/libexec/jailhouse/demos - $(if $(BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS), \ - cd $(@D) && $(PKG_PYTHON_SETUPTOOLS_ENV) $(HOST_DIR)/bin/python setup.py install --no-compile $(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS)) + $(JAILHOUSE_INSTALL_HELPER_SCRIPTS) endef $(eval $(generic-package)) From 0c54deff255d433db46e6c5ecd14c8e97f1715dd Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 1 Oct 2023 00:16:31 +0200 Subject: [PATCH 47/93] package/jailhouse: expand PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS In a follow-up patch, we want to remove this variable. Replace it with its expansion, which is anyway just $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) --root=$(TARGET_DIR) Signed-off-by: Arnout Vandecappelle [yann.morin.1998@free.fr: - fixup after introduction of JAILHOUSE_INSTALL_HELPER_SCRIPTS ] Signed-off-by: Yann E. MORIN --- package/jailhouse/jailhouse.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/jailhouse/jailhouse.mk b/package/jailhouse/jailhouse.mk index 913be765bd..c239e75e76 100644 --- a/package/jailhouse/jailhouse.mk +++ b/package/jailhouse/jailhouse.mk @@ -42,7 +42,8 @@ define JAILHOUSE_INSTALL_HELPER_SCRIPTS $(PKG_PYTHON_SETUPTOOLS_ENV) \ $(HOST_DIR)/bin/python setup.py \ install --no-compile \ - $(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) + $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ + --root=$(TARGET_DIR)) endef endif From ee9b7ee9ce60476609a66c35f4fa94ba7f61175b Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 1 Oct 2023 00:16:32 +0200 Subject: [PATCH 48/93] package/i2c-tools: expand PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS In a follow-up patch, we want to remove this variable. Replace it with its expansion, which is anyway just $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) --root=$(TARGET_DIR) Also remove PKG_PYTHON_SETUPTOOLS_BUILD_OPTS, which is not defined (i.e. empty). Signed-off-by: Arnout Vandecappelle Signed-off-by: Yann E. MORIN --- package/i2c-tools/i2c-tools.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk index adccd9475d..f8d1bcb4b0 100644 --- a/package/i2c-tools/i2c-tools.mk +++ b/package/i2c-tools/i2c-tools.mk @@ -36,15 +36,15 @@ I2C_TOOLS_PYTHON_BASE_ENV = \ define I2C_TOOLS_BUILD_PYSMBUS (cd $(@D)/py-smbus; \ $(I2C_TOOLS_PYTHON_BASE_ENV) \ - $(HOST_DIR)/bin/python setup.py build \ - $(PKG_PYTHON_SETUPTOOLS_BUILD_OPTS)) + $(HOST_DIR)/bin/python setup.py build) endef define I2C_TOOLS_INSTALL_PYSMBUS (cd $(@D)/py-smbus; \ $(I2C_TOOLS_PYTHON_BASE_ENV) \ $(HOST_DIR)/bin/python setup.py install \ - $(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS)) + $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ + --root=$(TARGET_DIR)) endef endif # BR2_PACKAGE_PYTHON3 From 6b915358babe37a721b4f6e032ec884174bd6e0b Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 1 Oct 2023 00:16:33 +0200 Subject: [PATCH 49/93] package/pkg-python.mk: replace $(_BASE_INSTALL*_CMD) with $($(SETUP_TYPE)_INSTALL*_CMD) The _BASE_INSTALL*_CMD variables are set based on the setup type, and only based on the setup type. Because of this, we have a large conditional tree in inner-python-package which makes things hard to read. Rather than conditions, it's also possible to use indirect variables. Concretely, we can define PKG_PYTHON_DISTUTILS_INSTALL_TARGET_CMD etc., and use $(PKG_PYTHON_$($(PKG)_SETUP_TYPE)_INSTALL_TARGET_CMD) instead of $($(PKG)_BASE_INSTALL_TARGET_CMD) to dispatch to the right _INSTALL_TARGET_CMD variable. The same applies to _INSTALL_STAGING_CMD and HOST_..._INSTALL_CMD. Since the _INSTALL*_OPTS variables are not (or no longer) used anywhere else, we can fold them into the _INSTALL*_CMD variables. setuptools-rust, flit and maturin didn't have their own definition of _BUILD_CMD but were under the setuptools resp. pep517 condition. For these, we have to define new variables that copy the value from PKG_PYTHON_SETUPTOOLS_BUILD_CMD resp. PKG_PYTHON_PEP517_BUILD_CMD. The condition tree is now empty, except for the error handling. Rework the conditions for the error handling and remove all other conditions. Signed-off-by: Arnout Vandecappelle Signed-off-by: Yann E. MORIN --- package/pkg-python.mk | 103 +++++++++++++++++++++++++----------------- 1 file changed, 61 insertions(+), 42 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index be9756acc4..bda79116c8 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -65,11 +65,13 @@ PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --prefix=/usr -PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \ +PKG_PYTHON_DISTUTILS_INSTALL_TARGET_CMD = \ + setup.py install --no-compile \ $(PKG_PYTHON_DISTUTILS_INSTALL_OPTS) \ --root=$(TARGET_DIR) -PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ +PKG_PYTHON_DISTUTILS_INSTALL_STAGING_CMD = \ + setup.py install \ $(PKG_PYTHON_DISTUTILS_INSTALL_OPTS) \ --root=$(STAGING_DIR) @@ -80,7 +82,8 @@ HOST_PKG_PYTHON_DISTUTILS_ENV = \ HOST_PKG_PYTHON_DISTUTILS_BUILD_CMD = \ setup.py build \ -HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ +HOST_PKG_PYTHON_DISTUTILS_INSTALL_CMD = \ + setup.py install \ --prefix=$(HOST_DIR) # Target setuptools-based packages @@ -99,11 +102,15 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --executable=/usr/bin/python \ --single-version-externally-managed -PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS = \ +PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_CMD = \ + $(PKG_PYTHON_SETUPTOOLS_CMD) \ + install --no-compile \ $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ --root=$(TARGET_DIR) -PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ +PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_CMD = \ + $(PKG_PYTHON_SETUPTOOLS_CMD) \ + install \ $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ --root=$(STAGING_DIR) @@ -114,7 +121,9 @@ HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ HOST_PKG_PYTHON_SETUPTOOLS_BUILD_CMD = \ $(PKG_PYTHON_SETUPTOOLS_CMD) build -HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_CMD = \ + $(PKG_PYTHON_SETUPTOOLS_CMD) \ + install \ --prefix=$(HOST_DIR) \ --root=/ \ --single-version-externally-managed @@ -128,6 +137,12 @@ PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ PKG_PYTHON_SETUPTOOLS_RUST_BUILD_CMD = \ $(PKG_PYTHON_SETUPTOOLS_BUILD_CMD) +PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_TARGET_CMD = \ + $(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_CMD) + +PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_STAGING_CMD = \ + $(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_CMD) + # Host setuptools-rust-based packages HOST_PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ $(HOST_PKG_PYTHON_SETUPTOOLS_ENV) \ @@ -137,6 +152,9 @@ HOST_PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ HOST_PKG_PYTHON_SETUPTOOLS_RUST_BUILD_CMD = \ $(HOST_PKG_PYTHON_SETUPTOOLS_BUILD_CMD) +HOST_PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_CMD = \ + $(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_CMD) + # Target pep517-based packages PKG_PYTHON_PEP517_ENV = \ $(PKG_PYTHON_ENV) @@ -148,14 +166,18 @@ PKG_PYTHON_PEP517_INSTALL_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix -PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ +PKG_PYTHON_PEP517_INSTALL_TARGET_CMD = \ + $(TOPDIR)/support/scripts/pyinstaller.py \ + dist/* \ $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(TARGET_DIR)/usr/bin \ --data=$(TARGET_DIR)/usr -PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ +PKG_PYTHON_PEP517_INSTALL_STAGING_CMD = \ + $(TOPDIR)/support/scripts/pyinstaller.py \ + dist/* \ $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ @@ -169,7 +191,9 @@ HOST_PKG_PYTHON_PEP517_ENV = \ HOST_PKG_PYTHON_PEP517_BUILD_CMD = \ -m build -n -w -HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ +HOST_PKG_PYTHON_PEP517_INSTALL_CMD = \ + $(TOPDIR)/support/scripts/pyinstaller.py \ + dist/* \ --interpreter=$(HOST_DIR)/bin/python \ --script-kind=posix \ --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ @@ -184,6 +208,12 @@ PKG_PYTHON_FLIT_ENV = \ PKG_PYTHON_FLIT_BUILD_CMD = \ $(PKG_PYTHON_PEP517_BUILD_CMD) +PKG_PYTHON_FLIT_INSTALL_TARGET_CMD = \ + $(PKG_PYTHON_PEP517_INSTALL_TARGET_CMD) + +PKG_PYTHON_FLIT_INSTALL_STAGING_CMD = \ + $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) + # Host flit packages HOST_PKG_PYTHON_FLIT_ENV = \ $(HOST_PKG_PYTHON_PEP517_ENV) @@ -191,6 +221,9 @@ HOST_PKG_PYTHON_FLIT_ENV = \ HOST_PKG_PYTHON_FLIT_BUILD_CMD = \ $(HOST_PKG_PYTHON_PEP517_BUILD_CMD) +HOST_PKG_PYTHON_FLIT_INSTALL_CMD = \ + $(HOST_PKG_PYTHON_PEP517_INSTALL_CMD) + # Host flit-bootstrap packages HOST_PKG_PYTHON_FLIT_BOOTSTRAP_ENV = \ $(HOST_PKG_PYTHON_PEP517_ENV) @@ -198,6 +231,9 @@ HOST_PKG_PYTHON_FLIT_BOOTSTRAP_ENV = \ HOST_PKG_PYTHON_FLIT_BOOTSTRAP_BUILD_CMD = \ -m flit_core.wheel +HOST_PKG_PYTHON_FLIT_BOOTSTRAP_INSTALL_CMD = \ + $(HOST_PKG_PYTHON_PEP517_INSTALL_CMD) + # Target maturin packages PKG_PYTHON_MATURIN_ENV = \ $(PKG_PYTHON_PEP517_ENV) \ @@ -207,6 +243,12 @@ PKG_PYTHON_MATURIN_ENV = \ PKG_PYTHON_MATURIN_BUILD_CMD = \ $(PKG_PYTHON_PEP517_BUILD_CMD) +PKG_PYTHON_MATURIN_INSTALL_TARGET_CMD = \ + $(PKG_PYTHON_PEP517_INSTALL_TARGET_CMD) + +PKG_PYTHON_MATURIN_INSTALL_STAGING_CMD = \ + $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) + # Host maturin packages HOST_PKG_PYTHON_MATURIN_ENV = \ $(HOST_PKG_PYTHON_PEP517_ENV) \ @@ -216,6 +258,9 @@ HOST_PKG_PYTHON_MATURIN_ENV = \ HOST_PKG_PYTHON_MATURIN_BUILD_CMD = \ $(HOST_PKG_PYTHON_PEP517_BUILD_CMD) +PKG_PYTHON_MATURIN_INSTALL_CMD = \ + $(PKG_PYTHON_PEP517_INSTALL_CMD) + ################################################################################ # inner-python-package -- defines how the configuration, compilation # and installation of a Python package should be done, implements a @@ -242,38 +287,12 @@ endif $(2)_SETUP_TYPE_UPPER = $$(call UPPERCASE,$$($(2)_SETUP_TYPE)) -# Distutils -ifeq ($$($(2)_SETUP_TYPE),distutils) -ifeq ($(4),target) -$(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_INSTALL_CMD = setup.py install $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS) -endif -# Setuptools -else ifneq ($$(filter setuptools setuptools-rust,$$($(2)_SETUP_TYPE)),) -ifeq ($(4),target) -$(2)_BASE_INSTALL_TARGET_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) install --no-compile $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) -$(2)_BASE_INSTALL_STAGING_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) install $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS) -else -$(2)_BASE_INSTALL_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) install $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) -endif -else ifneq ($$(filter flit maturin pep517,$$($(2)_SETUP_TYPE)),) -ifeq ($(4),target) -$(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_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) -endif -else ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) -ifeq ($(4),target) -$$(error flit-bootstrap setup type only supported for host packages) -else -$(2)_BASE_INSTALL_CMD ?= $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) -endif -else +ifneq ($$(filter-out distutils setuptools setuptools-rust pep517 flit flit-bootstrap maturin,$$($(2)_SETUP_TYPE)),) $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'maturin', 'setuptools', 'setuptools-rust', 'pep517' or 'flit'.") endif +ifeq ($(4)-$$($(2)_SETUP_TYPE),target-flit-bootstrap) +$$(error flit-bootstrap setup type only supported for host packages) +endif # We need to vendor the Cargo crates at download time for pyo3 based # packages. @@ -368,7 +387,7 @@ define $(2)_INSTALL_TARGET_CMDS $$(PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_ENV) \ $$($$(PKG)_ENV) \ $$(HOST_DIR)/bin/python3 \ - $$($$(PKG)_BASE_INSTALL_TARGET_CMD) \ + $$(PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_INSTALL_TARGET_CMD) \ $$($$(PKG)_INSTALL_TARGET_OPTS)) endef endif @@ -383,7 +402,7 @@ define $(2)_INSTALL_STAGING_CMDS $$(PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_ENV) \ $$($$(PKG)_ENV) \ $$(HOST_DIR)/bin/python3 \ - $$($$(PKG)_BASE_INSTALL_STAGING_CMD) \ + $$(PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_INSTALL_STAGING_CMD) \ $$($$(PKG)_INSTALL_STAGING_OPTS)) endef endif @@ -415,7 +434,7 @@ define $(2)_INSTALL_CMDS $$(HOST_PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_ENV) \ $$($$(PKG)_ENV) \ $$(HOST_DIR)/bin/python3 \ - $$($$(PKG)_BASE_INSTALL_CMD) \ + $$(HOST_PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_INSTALL_CMD) \ $$($$(PKG)_INSTALL_OPTS)) endef endif From bfafe9b3e9c5a5ae7767c534dccca2d14e50b41c Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 1 Oct 2023 00:16:34 +0200 Subject: [PATCH 50/93] docs/manual: remove references to PKG_PYTHON_*_OPTS These variables were removed. In addition, the text describing them wasn't terribly useful. Just remove the sentences describing them. Signed-off-by: Arnout Vandecappelle Signed-off-by: Yann E. MORIN --- docs/manual/adding-packages-python.adoc | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/docs/manual/adding-packages-python.adoc b/docs/manual/adding-packages-python.adoc index 500967f235..33dbfc30a5 100644 --- a/docs/manual/adding-packages-python.adoc +++ b/docs/manual/adding-packages-python.adoc @@ -135,25 +135,13 @@ therefore only use a few of them, or none. makes sense to use for distutils/setuptools based packages as flit/pep517 based packages do not pass these options to a +setup.py+ script but instead pass them to +support/scripts/pyinstaller.py+. - For target distutils packages, the +PKG_PYTHON_DISTUTILS_BUILD_OPTS+ - options are already passed automatically by the infrastructure. * +PYTHON_FOO_INSTALL_TARGET_OPTS+, +PYTHON_FOO_INSTALL_STAGING_OPTS+, +HOST_PYTHON_FOO_INSTALL_OPTS+ to specify additional options to pass to the Python +setup.py+ script (for distutils/setuptools packages) or +support/scripts/pyinstaller.py+ (for flit/pep517 packages) during the target installation step, the staging installation step or the - host installation, respectively. Note that the infrastructure is - automatically passing some options, defined in - +PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS+ or - +PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS+ (for target distutils - packages), +HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS+ (for host - distutils packages), +PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS+ or - +PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS+ (for target setuptools - packages), +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS+ (for host - setuptools packages) and +PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS+ or - +PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS+ (for target flit/pep517 - packages). + host installation, respectively. With the Python infrastructure, all the steps required to build and install the packages are already defined, and they generally work well From 0f26d434278ac641815e0fd856cc771d65f91617 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 25 Nov 2023 01:10:50 -0700 Subject: [PATCH 51/93] package/python-annotated-types: new package Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/Config.in | 1 + package/python-annotated-types/Config.in | 6 ++++++ .../python-annotated-types.hash | 5 +++++ .../python-annotated-types.mk | 15 +++++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 package/python-annotated-types/Config.in create mode 100644 package/python-annotated-types/python-annotated-types.hash create mode 100644 package/python-annotated-types/python-annotated-types.mk diff --git a/package/Config.in b/package/Config.in index 5a3410d758..68e6e29a4d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -974,6 +974,7 @@ menu "External python modules" source "package/python-aiozipkin/Config.in" source "package/python-alembic/Config.in" source "package/python-alsaaudio/Config.in" + source "package/python-annotated-types/Config.in" source "package/python-ansicolors/Config.in" source "package/python-apispec/Config.in" source "package/python-appdirs/Config.in" diff --git a/package/python-annotated-types/Config.in b/package/python-annotated-types/Config.in new file mode 100644 index 0000000000..36525a526b --- /dev/null +++ b/package/python-annotated-types/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_ANNOTATED_TYPES + bool "python-annotated-types" + help + Reusable constraint types to use with typing.Annotated. + + https://github.com/annotated-types/annotated-types diff --git a/package/python-annotated-types/python-annotated-types.hash b/package/python-annotated-types/python-annotated-types.hash new file mode 100644 index 0000000000..1663bcb51f --- /dev/null +++ b/package/python-annotated-types/python-annotated-types.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/annotated-types/json +md5 5fe2125b08851f0d05a8efad6456861c annotated_types-0.6.0.tar.gz +sha256 563339e807e53ffd9c267e99fc6d9ea23eb8443c08f112651963e24e22f84a5d annotated_types-0.6.0.tar.gz +# Locally computed sha256 checksums +sha256 fe1049884b1a0d9342901e88e07f32925d24b3121d9972b6a6805fb9824b095d LICENSE diff --git a/package/python-annotated-types/python-annotated-types.mk b/package/python-annotated-types/python-annotated-types.mk new file mode 100644 index 0000000000..8bc617069d --- /dev/null +++ b/package/python-annotated-types/python-annotated-types.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-annotated-types +# +################################################################################ + +PYTHON_ANNOTATED_TYPES_VERSION = 0.6.0 +PYTHON_ANNOTATED_TYPES_SOURCE = annotated_types-$(PYTHON_ANNOTATED_TYPES_VERSION).tar.gz +PYTHON_ANNOTATED_TYPES_SITE = https://files.pythonhosted.org/packages/67/fe/8c7b275824c6d2cd17c93ee85d0ee81c090285b6d52f4876ccc47cf9c3c4 +PYTHON_ANNOTATED_TYPES_SETUP_TYPE = pep517 +PYTHON_ANNOTATED_TYPES_LICENSE = MIT +PYTHON_ANNOTATED_TYPES_LICENSE_FILES = LICENSE +PYTHON_ANNOTATED_TYPES_DEPENDENCIES = host-python-hatchling + +$(eval $(python-package)) From 92fcdbd3e23aa03326d203271d02595409452690 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 25 Nov 2023 01:10:51 -0700 Subject: [PATCH 52/93] package/python-pydantic-core: new package Although pydantic-core likely implements a subset of the functionality in pydantic 1.10.8 as we currently package, there will not be any conflict as the modules namespace differ: import pydantic # 1.10.8 import pydantic_core So, we can add pydantic-core, then bump pydantic; we don't need to do both in the same commit. Signed-off-by: James Hilliard [yann.morin.1998@free.fr: add explanations from James about no-conflict] Signed-off-by: Yann E. MORIN --- package/Config.in | 1 + package/python-pydantic-core/Config.in | 8 ++++++++ .../python-pydantic-core.hash | 4 ++++ .../python-pydantic-core/python-pydantic-core.mk | 15 +++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 package/python-pydantic-core/Config.in create mode 100644 package/python-pydantic-core/python-pydantic-core.hash create mode 100644 package/python-pydantic-core/python-pydantic-core.mk diff --git a/package/Config.in b/package/Config.in index 68e6e29a4d..fcc09b07c4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1228,6 +1228,7 @@ menu "External python modules" source "package/python-pycups/Config.in" source "package/python-pydal/Config.in" source "package/python-pydantic/Config.in" + source "package/python-pydantic-core/Config.in" source "package/python-pydevmem/Config.in" source "package/python-pydyf/Config.in" source "package/python-pyelftools/Config.in" diff --git a/package/python-pydantic-core/Config.in b/package/python-pydantic-core/Config.in new file mode 100644 index 0000000000..3eeb1844a2 --- /dev/null +++ b/package/python-pydantic-core/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_PYDANTIC_CORE + bool "python-pydantic-core" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime + help + Core validation logic for pydantic written in rust. + + https://github.com/pydantic/pydantic-core diff --git a/package/python-pydantic-core/python-pydantic-core.hash b/package/python-pydantic-core/python-pydantic-core.hash new file mode 100644 index 0000000000..4927d816be --- /dev/null +++ b/package/python-pydantic-core/python-pydantic-core.hash @@ -0,0 +1,4 @@ +# Locally calculated after vendoring +sha256 b54296f8317e7ffd72726836636aa3a6c8c977d8f73b68253c443c0fe3731064 pydantic_core-2.14.5.tar.gz +# Locally computed sha256 checksums +sha256 2afdd30d54b4d62b6f488a6bcc1546e84ec5061f13f4209c03d012348783795a LICENSE diff --git a/package/python-pydantic-core/python-pydantic-core.mk b/package/python-pydantic-core/python-pydantic-core.mk new file mode 100644 index 0000000000..8b61323ab3 --- /dev/null +++ b/package/python-pydantic-core/python-pydantic-core.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-pydantic-core +# +################################################################################ + +PYTHON_PYDANTIC_CORE_VERSION = 2.14.5 +PYTHON_PYDANTIC_CORE_SOURCE = pydantic_core-$(PYTHON_PYDANTIC_CORE_VERSION).tar.gz +PYTHON_PYDANTIC_CORE_SITE = https://files.pythonhosted.org/packages/64/26/cffb93fe9c6b5a91c497f37fae14a4b073ecbc47fc36a9979c7aa888b245 +PYTHON_PYDANTIC_CORE_SETUP_TYPE = maturin +PYTHON_PYDANTIC_CORE_LICENSE = MIT +PYTHON_PYDANTIC_CORE_LICENSE_FILES = LICENSE +PYTHON_PYDANTIC_CORE_DEPENDENCIES = host-python-typing-extensions + +$(eval $(python-package)) From 05a259ed416d2bef1587a29d35fc117fa81183b2 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 25 Nov 2023 01:10:52 -0700 Subject: [PATCH 53/93] package/python-pydantic: bump to version 2.5.2 Add new python-annotated-types runtime dependency. Add new python-pydantic-core runtime dependency. Migrate build backend from setuptools to hatchling. License hash changed due to adding contributors: https://github.com/pydantic/pydantic/commit/7bc9c6525a81680c0dd9df3558ed5f33345a77c2 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pydantic/Config.in | 5 ++++- package/python-pydantic/python-pydantic.hash | 6 +++--- package/python-pydantic/python-pydantic.mk | 9 ++++++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/package/python-pydantic/Config.in b/package/python-pydantic/Config.in index 41ec43adf4..e9cd2e6780 100644 --- a/package/python-pydantic/Config.in +++ b/package/python-pydantic/Config.in @@ -1,8 +1,11 @@ config BR2_PACKAGE_PYTHON_PYDANTIC bool "python-pydantic" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-pydantic-core + select BR2_PACKAGE_PYTHON_ANNOTATED_TYPES # runtime + select BR2_PACKAGE_PYTHON_PYDANTIC_CORE # runtime select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Data validation and settings management using python 3.6 type hinting. - https://github.com/samuelcolvin/pydantic + https://github.com/pydantic/pydantic diff --git a/package/python-pydantic/python-pydantic.hash b/package/python-pydantic/python-pydantic.hash index 88b17f4575..0848debc1c 100644 --- a/package/python-pydantic/python-pydantic.hash +++ b/package/python-pydantic/python-pydantic.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pydantic/json -md5 f0e286c32f40ec45aba9603742739cd6 pydantic-1.10.8.tar.gz -sha256 1410275520dfa70effadf4c21811d755e7ef9bb1f1d077a21958153a92c8d9ca pydantic-1.10.8.tar.gz +md5 348281a5a27eb5253c7a83927aae64e1 pydantic-2.5.2.tar.gz +sha256 ff177ba64c6faf73d7afa2e8cad38fd456c0dbe01c9954e71038001cd15a6edd pydantic-2.5.2.tar.gz # Locally computed sha256 checksums -sha256 9e3946690ac88b6b73e8f001a0586af13568be8852fd514e4393f39761764387 LICENSE +sha256 a9e186f3ca16b5eef84318e7a701721351a00cb7b8ae3a4394b67b49e3529ef3 LICENSE diff --git a/package/python-pydantic/python-pydantic.mk b/package/python-pydantic/python-pydantic.mk index b800426d22..b5bb7ff853 100644 --- a/package/python-pydantic/python-pydantic.mk +++ b/package/python-pydantic/python-pydantic.mk @@ -4,11 +4,14 @@ # ################################################################################ -PYTHON_PYDANTIC_VERSION = 1.10.8 +PYTHON_PYDANTIC_VERSION = 2.5.2 PYTHON_PYDANTIC_SOURCE = pydantic-$(PYTHON_PYDANTIC_VERSION).tar.gz -PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/23/65/2aa13873e9e0084ecaec00fbe6c6096b65e1ab99ba66bdbf7e4e7c4cc915 -PYTHON_PYDANTIC_SETUP_TYPE = setuptools +PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/b7/41/3c8108f79fb7da2d2b17f35744232af4ffcd9e764ebe1e3fd4b26669b325 +PYTHON_PYDANTIC_SETUP_TYPE = pep517 PYTHON_PYDANTIC_LICENSE = MIT PYTHON_PYDANTIC_LICENSE_FILES = LICENSE +PYTHON_PYDANTIC_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme $(eval $(python-package)) From 32c90b6ad7e54e0a750feee33472777a4daef822 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sun, 26 Nov 2023 20:27:16 +0100 Subject: [PATCH 54/93] package/rtl8821cu: bump to version 2023-09-26 With this version we can build with Linux 6.7. Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/rtl8821cu/rtl8821cu.hash | 2 +- package/rtl8821cu/rtl8821cu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8821cu/rtl8821cu.hash b/package/rtl8821cu/rtl8821cu.hash index c98fd6234f..3d7a1be9d1 100644 --- a/package/rtl8821cu/rtl8821cu.hash +++ b/package/rtl8821cu/rtl8821cu.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8e155db366b5a97bc629534131e4fe1e29b455aa0ec9e1f42af23a9b6f610107 rtl8821cu-de36dfeff890086a9f30cd0052715fbaa9554087.tar.gz +sha256 5226fefd72d2dd2b8048a8d836f731139ddcb9a34eab68e9b07acee6ee5d8553 rtl8821cu-eb52ece92607394ecc22e96b41671ec3e5b1fa30.tar.gz sha256 22cdb0a9cf492dbf05c5b27381a5c0e73ae0d4622427b522b0ba92b7495e5fb0 LICENSE diff --git a/package/rtl8821cu/rtl8821cu.mk b/package/rtl8821cu/rtl8821cu.mk index 09fca49eb3..8f344d518f 100644 --- a/package/rtl8821cu/rtl8821cu.mk +++ b/package/rtl8821cu/rtl8821cu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8821CU_VERSION = de36dfeff890086a9f30cd0052715fbaa9554087 +RTL8821CU_VERSION = eb52ece92607394ecc22e96b41671ec3e5b1fa30 RTL8821CU_SITE = $(call github,morrownr,8821cu-20210916,$(RTL8821CU_VERSION)) RTL8821CU_LICENSE = GPL-2.0 RTL8821CU_LICENSE_FILES = LICENSE From a382a7d55432918d2a1e47ae4cbe7ed50fa17a08 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sun, 26 Nov 2023 21:12:27 +0100 Subject: [PATCH 55/93] package/esp-hosted: bump to version 2023-11-23 Drop local patch applied upstream: https://github.com/espressif/esp-hosted/commit/12b0ca9c46094c86eb76b5f0eaa626f868efaec8 Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- ...st-fix-build-failure-when-CONFIG_PM-.patch | 33 ------------------- package/esp-hosted/esp-hosted.hash | 2 +- package/esp-hosted/esp-hosted.mk | 2 +- 3 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 package/esp-hosted/0001-esp_hosted_ng-host-fix-build-failure-when-CONFIG_PM-.patch diff --git a/package/esp-hosted/0001-esp_hosted_ng-host-fix-build-failure-when-CONFIG_PM-.patch b/package/esp-hosted/0001-esp_hosted_ng-host-fix-build-failure-when-CONFIG_PM-.patch deleted file mode 100644 index abbc64a434..0000000000 --- a/package/esp-hosted/0001-esp_hosted_ng-host-fix-build-failure-when-CONFIG_PM-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 56920e3ce04aa2eadb529a6787200789bf1c3925 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 9 Aug 2023 23:16:52 +0200 -Subject: [PATCH] esp_hosted_ng: host: fix build failure when CONFIG_PM is not - defined - -wiphy->wowlan is not defined when CONFIG_PM is not enabled so let's -guard the assignment to wiphy->wowlan according to option CONFIG_PM. - -Upstream: https://github.com/espressif/esp-hosted/pull/254 - -Signed-off-by: Giulio Benetti ---- - esp_hosted_ng/host/esp_cfg80211.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/esp_hosted_ng/host/esp_cfg80211.c b/esp_hosted_ng/host/esp_cfg80211.c -index 70fdbb9773..d3c4108c29 100644 ---- a/esp_hosted_ng/host/esp_cfg80211.c -+++ b/esp_hosted_ng/host/esp_cfg80211.c -@@ -638,7 +638,9 @@ int esp_cfg80211_register(struct esp_adapter *adapter) - wiphy->max_scan_ie_len = 1000; - wiphy->max_sched_scan_ssids = 10; - wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM; -+#ifdef CONFIG_PM - wiphy->wowlan = &esp_wowlan_support; -+#endif - - /* Advertise SAE support */ - wiphy->features |= NL80211_FEATURE_SAE; --- -2.34.1 - diff --git a/package/esp-hosted/esp-hosted.hash b/package/esp-hosted/esp-hosted.hash index c17fe262a1..b129bb42f9 100644 --- a/package/esp-hosted/esp-hosted.hash +++ b/package/esp-hosted/esp-hosted.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3310845b2324bda5774b91bcdd3f47621126f4a0011a0f61e31b0ad4a44db2f5 esp-hosted-11e90f185a5a9922343e73e44032816a0e3ddedb.tar.gz +sha256 6e023c26355643f2aaf6d79d5910f64c49ea638063235d519075629643518a71 esp-hosted-ce3c50a33fa4bc562a1b6cbcee292c1ae0b0a404.tar.gz sha256 ed57d96d27be775b22f9571d3724ef84e0d0b8f24b805ec7f87a32189de19a9c LICENSE diff --git a/package/esp-hosted/esp-hosted.mk b/package/esp-hosted/esp-hosted.mk index 7491c46512..578108c91d 100644 --- a/package/esp-hosted/esp-hosted.mk +++ b/package/esp-hosted/esp-hosted.mk @@ -4,7 +4,7 @@ # ################################################################################ -ESP_HOSTED_VERSION = 11e90f185a5a9922343e73e44032816a0e3ddedb +ESP_HOSTED_VERSION = ce3c50a33fa4bc562a1b6cbcee292c1ae0b0a404 ESP_HOSTED_SITE = $(call github,espressif,esp-hosted,$(ESP_HOSTED_VERSION)) ESP_HOSTED_DEPENDENCIES = linux ESP_HOSTED_LICENSE = GPL-2.0 From 6556bfba4f6e40186cdb7135b6ebde8a9fa9fa9f Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Thu, 23 Nov 2023 08:43:59 +0300 Subject: [PATCH 56/93] package/libgeos: bump version to 3.12.1 Changelog: https://github.com/libgeos/geos/releases/tag/3.12.1 Signed-off-by: Maxim Kochetkov Signed-off-by: Yann E. MORIN --- 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 bb433117a5..37fe7d6d23 100644 --- a/package/libgeos/libgeos.hash +++ b/package/libgeos/libgeos.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d96db96011259178a35555a0f6d6e75a739e52a495a6b2aa5efb3d75390fbc39 geos-3.12.0.tar.bz2 +sha256 d6ea7e492224b51193e8244fe3ec17c4d44d0777f3c32ca4fb171140549a0d03 geos-3.12.1.tar.bz2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libgeos/libgeos.mk b/package/libgeos/libgeos.mk index 70f8ca3495..491168324f 100644 --- a/package/libgeos/libgeos.mk +++ b/package/libgeos/libgeos.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGEOS_VERSION = 3.12.0 +LIBGEOS_VERSION = 3.12.1 LIBGEOS_SITE = http://download.osgeo.org/geos LIBGEOS_SOURCE = geos-$(LIBGEOS_VERSION).tar.bz2 LIBGEOS_LICENSE = LGPL-2.1 From e056aeeca9cf8c00c6da62c39979ce6c55c92791 Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Thu, 23 Nov 2023 09:00:19 +0300 Subject: [PATCH 57/93] package/osm2pgsql: bump version to 1.10.0 Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/1.10.0 Signed-off-by: Maxim Kochetkov Signed-off-by: Yann E. MORIN --- 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 0b4eb17c99..a93ceb6a7f 100644 --- a/package/osm2pgsql/osm2pgsql.hash +++ b/package/osm2pgsql/osm2pgsql.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dc30a3ad9a27f944e4169be9a8e07ee09711901536ddc8fcf4a292bd3aec51d9 osm2pgsql-1.9.2.tar.gz +sha256 33849d8edacbca5ab5492fed32ac954de14f92ab6b3028c03ef88bb7ab596d20 osm2pgsql-1.10.0.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index 44c980ac95..1565c2142c 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -4,7 +4,7 @@ # ################################################################################ -OSM2PGSQL_VERSION = 1.9.2 +OSM2PGSQL_VERSION = 1.10.0 OSM2PGSQL_SITE = $(call github,openstreetmap,osm2pgsql,$(OSM2PGSQL_VERSION)) OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING From beafbb83ad58e2f6d446ac03565207cb0128c82d Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Thu, 23 Nov 2023 09:05:58 +0300 Subject: [PATCH 58/93] package/timescaledb: bump version to 2.12.2 Release notes: https://github.com/timescale/timescaledb/blob/2.12.2/CHANGELOG.md Signed-off-by: Maxim Kochetkov Signed-off-by: Yann E. MORIN --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 0f2269986e..ae1d3db1e1 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 acca5f6ec5684722374eece92f73d7763bd171075074fd2e6bd0244bda9fbc25 timescaledb-2.11.2.tar.gz +sha256 d24cd29aad411d3e41d543d1a30827c48f8e01a48563650db5fac145ad7a01eb timescaledb-2.12.2.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index fe7bcbc36e..adae1c2bae 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.11.2 +TIMESCALEDB_VERSION = 2.12.2 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From cc363e9a93484e734313b17962b931b3df6eedaa Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Mon, 27 Nov 2023 11:59:59 +0000 Subject: [PATCH 59/93] package/multipath-tools: bump to version 0.9.7 Change log: - https://github.com/opensvc/multipath-tools/pull/77 Signed-off-by: Alexander Egorenkov Signed-off-by: Yann E. MORIN --- package/multipath-tools/multipath-tools.hash | 2 +- package/multipath-tools/multipath-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/multipath-tools/multipath-tools.hash b/package/multipath-tools/multipath-tools.hash index 06aa5ccc80..0f51c38846 100644 --- a/package/multipath-tools/multipath-tools.hash +++ b/package/multipath-tools/multipath-tools.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 401c6f6e8dc5d3feaaee76280716aee718579ac024ce4f2fae77c798dc7a0f9f multipath-tools-0.9.6.tar.gz +sha256 8f0a7ddc01137d0f90ac3ef5700131dfbd6cf3bbbccdcfa317e8379efa328d59 multipath-tools-0.9.7.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0 sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0 sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c LICENSES/LGPL-2.0 diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index 7071e1fd1b..e62e85e14d 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MULTIPATH_TOOLS_VERSION = 0.9.6 +MULTIPATH_TOOLS_VERSION = 0.9.7 MULTIPATH_TOOLS_SITE = $(call github,opensvc,multipath-tools,$(MULTIPATH_TOOLS_VERSION)) MULTIPATH_TOOLS_LICENSE = \ From 0868e3430bd4f6f8b05087c45a29e0df2cb46969 Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Mon, 27 Nov 2023 11:59:58 +0000 Subject: [PATCH 60/93] package/makedumpfile: bump to version 1.7.4 Release notes: - https://github.com/makedumpfile/makedumpfile/releases/tag/1.7.4 Signed-off-by: Alexander Egorenkov Signed-off-by: Yann E. MORIN --- package/makedumpfile/makedumpfile.hash | 2 +- package/makedumpfile/makedumpfile.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/makedumpfile/makedumpfile.hash b/package/makedumpfile/makedumpfile.hash index 665023d87b..fdb30de88d 100644 --- a/package/makedumpfile/makedumpfile.hash +++ b/package/makedumpfile/makedumpfile.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f059dbebf5156a9ab97cd3c1f41ad5df3436c7ab4dd6dbffa234fc4e93cfa2ce makedumpfile-1.7.3.tar.gz +sha256 0554f5de516c51f5756e437dbfc353722b16b20e875241275554b474e89298db makedumpfile-1.7.4.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/makedumpfile/makedumpfile.mk b/package/makedumpfile/makedumpfile.mk index 6102c92bd8..410752682d 100644 --- a/package/makedumpfile/makedumpfile.mk +++ b/package/makedumpfile/makedumpfile.mk @@ -4,7 +4,7 @@ # ################################################################################ -MAKEDUMPFILE_VERSION = 1.7.3 +MAKEDUMPFILE_VERSION = 1.7.4 MAKEDUMPFILE_SITE = https://github.com/makedumpfile/makedumpfile/releases/download/$(MAKEDUMPFILE_VERSION) MAKEDUMPFILE_DEPENDENCIES = bzip2 elfutils xz zlib MAKEDUMPFILE_LICENSE = GPL-2.0 From 9b6c2acf590b2f3402bbe22431bd2e04f9499973 Mon Sep 17 00:00:00 2001 From: Bagas Sanjaya Date: Mon, 27 Nov 2023 20:38:08 +0700 Subject: [PATCH 61/93] package/git: bump to version 2.43.0 Bump the package version to 2.43.0. For the full changelog, see the release announcement at [1]. Link: https://lore.kernel.org/git/xmqqzfz8l5or.fsf@gitster.g/ [1] Signed-off-by: Bagas Sanjaya Signed-off-by: Yann E. MORIN --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index f3f5915c8d..9cf044cc07 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 8e46fa96bf35a65625d85fde50391e39bc0620d1bb39afb70b96c4a237a1a4f7 git-2.42.1.tar.xz +sha256 5446603e73d911781d259e565750dcd277a42836c8e392cac91cf137aa9b76ec git-2.43.0.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index cb49986c43..1502968186 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.42.1 +GIT_VERSION = 2.43.0 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From 83b799457f9d48cf5949ba2b6e0f66c20724ba30 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 27 Nov 2023 18:43:50 +0200 Subject: [PATCH 62/93] package/socat: bump to version 1.8.0.0 Update README hash for changed not related to license. Change patch 0001 to git format. socat is now hosted on git. Also, update to apply to current version. Add upstream status to both patches. Signed-off-by: Baruch Siach Signed-off-by: Yann E. MORIN --- .checkpackageignore | 2 -- package/socat/0001-no-documentation.patch | 34 ++++++++++++++----- .../0002-compat-set-NETDB_INTERNAL.patch | 7 ++-- package/socat/socat.hash | 6 ++-- package/socat/socat.mk | 2 +- 5 files changed, 33 insertions(+), 18 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 0663149d01..e9fdf9f01c 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1292,8 +1292,6 @@ package/snort/0005-fix-sparc.patch Upstream package/snort/0006-Fix-compile-error-when-building-against-uclibc-or-mu.patch Upstream package/snort/0007-Fix-error-when-building-on-a-Fedora-host-machine.patch Upstream package/snort/0008-Fix-NO-OPTIMIZE.patch Upstream -package/socat/0001-no-documentation.patch Upstream -package/socat/0002-compat-set-NETDB_INTERNAL.patch Upstream package/socketcand/0001-Fix-GCC10-build-failure.patch Upstream package/softether/0001-Create-autotools-plumbing-for-SoftEther.patch Upstream package/softether/0002-Create-libsoftether.so-and-dynamically-link.patch Upstream diff --git a/package/socat/0001-no-documentation.patch b/package/socat/0001-no-documentation.patch index ce088dfafc..b4c3e1ffde 100644 --- a/package/socat/0001-no-documentation.patch +++ b/package/socat/0001-no-documentation.patch @@ -1,37 +1,53 @@ -socat: disable documentation build/installation +From 01463f5dbe19501948dec26160e0cc3b4e9167b4 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 27 Nov 2023 18:09:57 +0200 +Subject: [PATCH] socat: disable documentation build/installation The documentation generation process requires a special yold2man program, for which we don't have a package in Buildroot. Since we generally don't care much about documentation of packages, just adjust the package Makefile.in to not build/install its documentation. +Upstream: N/A Signed-off-by: Thomas Petazzoni +[baruch: update for 1.8.0.0; git patch format] +Signed-off-by: Baruch Siach +--- + Makefile.in | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) -Index: b/Makefile.in -=================================================================== +diff --git a/Makefile.in b/Makefile.in +index c01b1a4a2306..fd89acb06f3c 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -93,7 +93,7 @@ - Config/Makefile.Cygwin-1-5-25 Config/config.Cygwin-1-5-25.h \ - Config/Makefile.MacOSX-10-5 Config/config.MacOSX-10-5.h +@@ -82,7 +82,7 @@ SHFILES = socat-chain.sh socat-mux.sh socat-broker.sh \ + TESTFILES = test.sh socks4echo.sh proxyecho.sh readline-test.sh \ + proxy.sh socks4a-echo.sh -all: progs doc +all: progs scmclean: gitclean -@@ -136,13 +136,11 @@ +@@ -128,7 +128,7 @@ libxio.a: $(XIOOBJS) $(UTLOBJS) strip: progs strip $(PROGS) -install: progs $(srcdir)/doc/socat.1 +install: progs mkdir -p $(DESTDIR)$(BINDEST) - $(INSTALL) -m 755 socat $(DESTDIR)$(BINDEST) + $(INSTALL) -m 755 socat $(DESTDIR)$(BINDEST)/socat1 + ln -sf socat1 $(DESTDIR)$(BINDEST)/socat +@@ -137,9 +137,6 @@ install: progs $(srcdir)/doc/socat.1 + $(INSTALL) -m 755 socat-broker.sh $(DESTDIR)$(BINDEST) $(INSTALL) -m 755 procan $(DESTDIR)$(BINDEST) $(INSTALL) -m 755 filan $(DESTDIR)$(BINDEST) - mkdir -p $(DESTDIR)$(MANDEST)/man1 -- $(INSTALL) -m 644 $(srcdir)/doc/socat.1 $(DESTDIR)$(MANDEST)/man1/ +- $(INSTALL) -m 644 $(srcdir)/doc/socat.1 $(DESTDIR)$(MANDEST)/man1/socat1.1 +- ln -sf socat1.1 $(DESTDIR)$(MANDEST)/man1/socat.1 uninstall: rm -f $(DESTDIR)$(BINDEST)/socat +-- +2.42.0 + diff --git a/package/socat/0002-compat-set-NETDB_INTERNAL.patch b/package/socat/0002-compat-set-NETDB_INTERNAL.patch index da31073ba5..f526664210 100644 --- a/package/socat/0002-compat-set-NETDB_INTERNAL.patch +++ b/package/socat/0002-compat-set-NETDB_INTERNAL.patch @@ -1,4 +1,4 @@ -From e7804d1750652e39c7a5803d360b29b2637a695f Mon Sep 17 00:00:00 2001 +From 4b86f141c7c4725093fb2e12c769fec393727519 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 28 Aug 2016 21:04:01 +0200 Subject: [PATCH] compat: set NETDB_INTERNAL @@ -12,16 +12,17 @@ Based on [2]. [1] https://sourceware.org/git/?p=glibc.git;a=blob;f=resolv/netdb.h;h=3aba530932c7a62a4f23e3193e9186da677f552b;hb=fdfc9260b61d3d72541f18104d24c7bcb0ce5ca2#l74 [2] http://git.alpinelinux.org/cgit/aports/tree/main/socat/netdb-internal.patch?id=5a45173b50892cb634197c30b3506ebff98d3b7d +Upstream: sent to socat@dest-unreach.org Signed-off-by: Romain Naour --- compat.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compat.h b/compat.h -index 19a929f..4f5ee6d 100644 +index bb7e2d8f1782..72e73c701f64 100644 --- a/compat.h +++ b/compat.h -@@ -666,6 +666,8 @@ typedef int sig_atomic_t; +@@ -851,6 +851,8 @@ typedef unsigned long T_sigset; #if !defined(NETDB_INTERNAL) && defined(h_NETDB_INTERNAL) # define NETDB_INTERNAL h_NETDB_INTERNAL diff --git a/package/socat/socat.hash b/package/socat/socat.hash index 2113e1b3a4..2a14d75303 100644 --- a/package/socat/socat.hash +++ b/package/socat/socat.hash @@ -1,8 +1,8 @@ # From http://www.dest-unreach.org/socat/download.md5sum -md5 a605d3779465f42c07fc507cfbfb08f9 socat-1.7.4.4.tar.bz2 +md5 51f9ecdf5d942d0a3c150ea400eb89ef socat-1.8.0.0.tar.bz2 # From http://www.dest-unreach.org/socat/download.sha256sum -sha256 fbd42bd2f0e54a3af6d01bdf15385384ab82dbc0e4f1a5e153b3e0be1b6380ac socat-1.7.4.4.tar.bz2 +sha256 e1de683dd22ee0e3a6c6bbff269abe18ab0c9d7eb650204f125155b9005faca7 socat-1.8.0.0.tar.bz2 # Locally calculated -sha256 3555c6bc2779ff0f9a7145d1e3cd1d8fde59548bcd3364a23b907de21eec5aa8 README +sha256 de9d702354b2e748ea87eb20d18c3d90ebede5dc6d2fc3c2e0645d139a5181bc README sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 fd9e48ca316a5032069b9521f4f4b4d9b1c60365012bae1e62286bcd5bd2e761 COPYING.OpenSSL diff --git a/package/socat/socat.mk b/package/socat/socat.mk index f958f26522..1e2880c028 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -4,7 +4,7 @@ # ################################################################################ -SOCAT_VERSION = 1.7.4.4 +SOCAT_VERSION = 1.8.0.0 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2 SOCAT_SITE = http://www.dest-unreach.org/socat/download SOCAT_LICENSE = GPL-2.0 with OpenSSL exception From fc7606010e4edde7a34c545fac0fe7f82d4a5e18 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Mon, 27 Nov 2023 11:14:04 +0100 Subject: [PATCH 63/93] package/re2: bump to version 2023.11.01 - libabseil-cpp is now a dependency - required c++ standard is now c++14 [0] --> requires gcc8 - drop fix for gcc <= 5 introduced in 25fd3b0a523805db14682f7c559cc1c9c366ed55 (c++ >= 14 is the default for gcc >= 8) - update gcc required for depending packages qt5webengine & grpc [0] https://github.com/google/re2/wiki/Install/7c2552dd54444695ce5a9e6a01dd8f312b347914 Signed-off-by: Michael Nosthoff Signed-off-by: Yann E. MORIN --- package/grpc/Config.in | 2 +- package/qt5/qt5webengine/Config.in | 6 +++--- package/re2/Config.in | 7 ++++--- package/re2/re2.hash | 2 +- package/re2/re2.mk | 13 +++++-------- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/package/grpc/Config.in b/package/grpc/Config.in index afe0ea8450..ef3e1c86cb 100644 --- a/package/grpc/Config.in +++ b/package/grpc/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_GRPC depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf, re2 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # libabseil-cpp + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # libabseil-cpp, re2 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 diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 542f212dfc..cfa5893f41 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -10,10 +10,10 @@ config BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT # qt5base-icu depends on BR2_USE_MMU # libglib2, qt5base-dbus -comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 4.9, host gcc >= 4.9, threads, wchar" +comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 8, host gcc >= 4.9, threads, wchar" depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \ !BR2_HOST_GCC_AT_LEAST_4_9 || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR @@ -26,7 +26,7 @@ config BR2_PACKAGE_QT5WEBENGINE depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h, mallinfo depends on BR2_HOST_GCC_AT_LEAST_4_9 # qt5base-icu - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # qt5base-icu + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # re2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libvpx, qt5base-dbus depends on BR2_USE_WCHAR # libglib2 depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs diff --git a/package/re2/Config.in b/package/re2/Config.in index 64217e8aa2..0ac0041f6d 100644 --- a/package/re2/Config.in +++ b/package/re2/Config.in @@ -1,8 +1,9 @@ config BR2_PACKAGE_RE2 bool "re2" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # needs C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++14 depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_LIBABSEIL_CPP help RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like @@ -11,7 +12,7 @@ config BR2_PACKAGE_RE2 https://github.com/google/re2 -comment "re2 needs a toolchain w/ C++, threads, gcc >= 4.8" +comment "re2 needs a toolchain w/ C++, threads, gcc >= 8" depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 diff --git a/package/re2/re2.hash b/package/re2/re2.hash index a39dece7a9..5f590aba6e 100644 --- a/package/re2/re2.hash +++ b/package/re2/re2.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 cbce8b7803e856827201a132862e41af386e7afd9cc6d9a9bc7a4fa4d8ddbdde re2-2023-02-01.tar.gz +sha256 4e6593ac3c71de1c0f322735bc8b0492a72f66ffccfad76e259fa21c41d27d8a re2-2023-11-01.tar.gz sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE diff --git a/package/re2/re2.mk b/package/re2/re2.mk index 5587366b1f..b81a64f2e9 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -4,29 +4,26 @@ # ################################################################################ -RE2_VERSION = 2023-02-01 +RE2_VERSION = 2023-11-01 RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) 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" +RE2_DEPENDENCIES = libabseil-cpp define RE2_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ -C $(@D) $(if $(BR2_STATIC_LIBS),static) endef define RE2_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ + $(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) $(RE2_MAKE_OPTS) \ + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ DESTDIR="$(TARGET_DIR)" prefix=/usr -C $(@D) \ $(if $(BR2_STATIC_LIBS),static-install,install) endef From 13ba668a2da3a0dcb386578ce15b00a444101dbe Mon Sep 17 00:00:00 2001 From: Bram Oosterhuis Date: Sat, 4 Nov 2023 23:01:51 +0100 Subject: [PATCH 64/93] configs/raspberrypi: bump Linux version to 6.1.61 Linux 6.1 has been marked LTS for a long time now. Time to bump Linux for RaspberryPi's to the latest 6.1.61 Since April 2022 the RaspberryPi defconfigs have compressed kernel module enabled by default. (see [1] and [2]). To load compressed kernel modules kmod and xz packages are needed because busybox doesn't support it. For testing I used RaspberryPi 2, 3(32+64bit) and 4(32+64bit), all with mdev enabled. [1] https://github.com/raspberrypi/linux/commit/c45b4223a4e4a8cfe39edbb4949329ea478fa4e2 [2] https://github.com/raspberrypi/linux/issues/4966 Signed-off-by: Bram Oosterhuis Reviewed-by: Marcus Hoffmann Tested-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- configs/raspberrypi0_defconfig | 13 ++++++++++--- configs/raspberrypi0w_defconfig | 13 ++++++++++--- configs/raspberrypi2_defconfig | 13 ++++++++++--- configs/raspberrypi3_64_defconfig | 13 ++++++++++--- configs/raspberrypi3_defconfig | 13 ++++++++++--- configs/raspberrypi3_qt5we_defconfig | 13 ++++++++++--- configs/raspberrypi4_64_defconfig | 13 ++++++++++--- configs/raspberrypi4_defconfig | 13 ++++++++++--- configs/raspberrypi_defconfig | 13 ++++++++++--- configs/raspberrypicm4io_64_defconfig | 13 ++++++++++--- configs/raspberrypicm4io_defconfig | 13 ++++++++++--- configs/raspberrypizero2w_defconfig | 13 ++++++++++--- 12 files changed, 120 insertions(+), 36 deletions(-) diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig index 4506e94bce..6bff1ebf81 100644 --- a/configs/raspberrypi0_defconfig +++ b/configs/raspberrypi0_defconfig @@ -2,14 +2,14 @@ BR2_arm=y BR2_arm1176jzf_s=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B from the kernel sources: the zero is the same @@ -37,3 +37,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi0/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi0/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig index 7a35794c2d..ac72d49f92 100644 --- a/configs/raspberrypi0w_defconfig +++ b/configs/raspberrypi0w_defconfig @@ -2,14 +2,14 @@ BR2_arm=y BR2_arm1176jzf_s=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w" @@ -32,3 +32,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi0w/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi0w/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index 9b484c5588..dee9a0b23f 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -7,12 +7,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources @@ -39,3 +39,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi2/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi2/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig index 4d838ae0e8..6871dc0fe0 100644 --- a/configs/raspberrypi3_64_defconfig +++ b/configs/raspberrypi3_64_defconfig @@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" # Build the DTB from the kernel sources @@ -37,3 +37,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3-64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3-64/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index 0a59ab42a9..f0e7b82191 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources @@ -37,3 +37,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig index 40d0c0f888..532b3ed686 100644 --- a/configs/raspberrypi3_qt5we_defconfig +++ b/configs/raspberrypi3_qt5we_defconfig @@ -7,12 +7,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources @@ -51,3 +51,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="400M" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig index 5942f7c4e1..453bbe9440 100644 --- a/configs/raspberrypi4_64_defconfig +++ b/configs/raspberrypi4_64_defconfig @@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources @@ -36,3 +36,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4-64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4-64/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig index 4e5580c140..1ed5d34b56 100644 --- a/configs/raspberrypi4_defconfig +++ b/configs/raspberrypi4_defconfig @@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources @@ -36,3 +36,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index cca53f9b37..01b4353b84 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -4,14 +4,14 @@ BR2_ARM_EABIHF=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources @@ -38,3 +38,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y diff --git a/configs/raspberrypicm4io_64_defconfig b/configs/raspberrypicm4io_64_defconfig index 29cb0472d7..d53711c3a7 100644 --- a/configs/raspberrypicm4io_64_defconfig +++ b/configs/raspberrypicm4io_64_defconfig @@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources @@ -39,3 +39,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypicm4io-64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypicm4io-64/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y diff --git a/configs/raspberrypicm4io_defconfig b/configs/raspberrypicm4io_defconfig index 017aecc0dd..4b50dc9ef9 100644 --- a/configs/raspberrypicm4io_defconfig +++ b/configs/raspberrypicm4io_defconfig @@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources @@ -39,3 +39,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypicm4io/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypicm4io/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y diff --git a/configs/raspberrypizero2w_defconfig b/configs/raspberrypizero2w_defconfig index 2ea503ca24..1bf335c076 100644 --- a/configs/raspberrypizero2w_defconfig +++ b/configs/raspberrypizero2w_defconfig @@ -2,14 +2,14 @@ BR2_arm=y BR2_cortex_a53=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6.1=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources @@ -34,3 +34,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypizero2w/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypizero2w/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y From 9d27996289f50f1e3e16748920f5945e1efcffa7 Mon Sep 17 00:00:00 2001 From: Bram Oosterhuis Date: Sat, 4 Nov 2023 23:01:52 +0100 Subject: [PATCH 65/93] package/rpi-firmware: bump version to 83dafbc Version 83dafbc will match the with kernel 6.1.61 Signed-off-by: Bram Oosterhuis Reviewed-by: Marcus Hoffmann Tested-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- package/rpi-firmware/rpi-firmware.hash | 2 +- package/rpi-firmware/rpi-firmware.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash index ec13115f3b..33e05a2f4a 100644 --- a/package/rpi-firmware/rpi-firmware.hash +++ b/package/rpi-firmware/rpi-firmware.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 33aea2cb9c3be94c3dd6a96fbb3443eee5af1dc5fc9140e1fadc50832983064e rpi-firmware-3f20b832b27cd730deb6419b570f31a98167eef6.tar.gz +sha256 dd43e77ca1a8969cdb7f05dd72a57f90862071d5a93bdd6aea8246aba85689cf rpi-firmware-83dafbc92c0e63f76ca2ecdd42462d56489d1c77.tar.gz sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 53d6d8ca06..37e010d1de 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_VERSION = 3f20b832b27cd730deb6419b570f31a98167eef6 +RPI_FIRMWARE_VERSION = 83dafbc92c0e63f76ca2ecdd42462d56489d1c77 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom From 5d4bc471494f256b1d53e6895d780452c895e3d9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 29 Nov 2023 18:39:01 +0100 Subject: [PATCH 66/93] package/xtables-addons: bump to version 3.24 This bump will fix the following build failure with kernel >= 6.2 thanks to https://codeberg.org/jengelh/xtables-addons/commit/51761c3fe2454e0b4bc25274dd55d4ab72c54bf0: /home/buildroot/autobuild/instance-1/output-1/build/xtables-addons-3.22/extensions/xt_TARPIT.c: In function 'xttarpit_honeypot': /home/buildroot/autobuild/instance-1/output-1/build/xtables-addons-3.22/extensions/xt_TARPIT.c:110:26: error: implicit declaration of function 'prandom_u32_max'; did you mean 'prandom_u32_state'? [-Werror=implicit-function-declaration] 110 | (prandom_u32_max(0x20) - 0xf); | ^~~~~~~~~~~~~~~ | prandom_u32_state Fixes: - http://autobuild.buildroot.org/results/e8f2a0cb5b38ff98da97268c4b642554a0a732e1 - http://autobuild.buildroot.org/results/0191ee0590c08b73f17b35a5c8521796693772b5 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/xtables-addons/xtables-addons.hash | 2 +- package/xtables-addons/xtables-addons.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xtables-addons/xtables-addons.hash b/package/xtables-addons/xtables-addons.hash index 840a31f947..7bdbbb8578 100644 --- a/package/xtables-addons/xtables-addons.hash +++ b/package/xtables-addons/xtables-addons.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 faa16a27166275afbfe8df605f55c3a81ac693bf19da674d45ceded4137ae217 xtables-addons-3.22.tar.xz +sha256 3e823f71720519ced31c4c7d2bfaf7120d9c01c59a0843dfcbe93c95c64d81c1 xtables-addons-3.24.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE diff --git a/package/xtables-addons/xtables-addons.mk b/package/xtables-addons/xtables-addons.mk index e794538956..3111602816 100644 --- a/package/xtables-addons/xtables-addons.mk +++ b/package/xtables-addons/xtables-addons.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTABLES_ADDONS_VERSION = 3.22 +XTABLES_ADDONS_VERSION = 3.24 XTABLES_ADDONS_SOURCE = xtables-addons-$(XTABLES_ADDONS_VERSION).tar.xz XTABLES_ADDONS_SITE = https://inai.de/files/xtables-addons XTABLES_ADDONS_DEPENDENCIES = iptables linux host-pkgconf From 03e66a35eabaed9f258b8670eba2e8fc13dd3eb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?= Date: Wed, 29 Nov 2023 08:02:57 -0300 Subject: [PATCH 67/93] package/rsyslog: bump version to 8.2310.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Flávio Tapajós Signed-off-by: Peter Korsgaard --- package/rsyslog/rsyslog.hash | 2 +- package/rsyslog/rsyslog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rsyslog/rsyslog.hash b/package/rsyslog/rsyslog.hash index 4049590bb8..90df3e054f 100644 --- a/package/rsyslog/rsyslog.hash +++ b/package/rsyslog/rsyslog.hash @@ -1,5 +1,5 @@ # From http://www.rsyslog.com/downloads/download-v8-stable/ -sha256 a6d731e46ad3d64f6ad4b19bbf1bf56ca4760a44a24bb96823189dc2e71f7028 rsyslog-8.2204.1.tar.gz +sha256 20d9ce792bf0a7ed0703dbf0941490f8be655f48b55b4bebdc0827bbb0ddbf11 rsyslog-8.2310.0.tar.gz # Locally calculated sha256 054b3a047d9232376a46b87356b19b0c0c2924cb5e6911ab96a01fc4b515f083 COPYING diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index 84fd2d2e5e..cf9f2c0e79 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -4,7 +4,7 @@ # ################################################################################ -RSYSLOG_VERSION = 8.2204.1 +RSYSLOG_VERSION = 8.2310.0 RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog RSYSLOG_LICENSE = GPL-3.0, LGPL-3.0, Apache-2.0 RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20 From 6358bb3a9bcf8d4c66893e8df513d18bf0022c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?= Date: Wed, 29 Nov 2023 08:02:58 -0300 Subject: [PATCH 68/93] package/rsyslog: add libdbi-drivers optional dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Needed in order to use omlibdbi module Signed-off-by: Flávio Tapajós Signed-off-by: Peter Korsgaard --- package/rsyslog/rsyslog.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index cf9f2c0e79..8ea92ea785 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -151,6 +151,13 @@ RSYSLOG_CONF_OPTS += \ --disable-omjournal endif +ifeq ($(BR2_PACKAGE_LIBDBI_DRIVERS),y) +RSYSLOG_CONF_OPTS += --enable-libdbi +RSYSLOG_DEPENDENCIES += libdbi-drivers +else +RSYSLOG_CONF_OPTS += --disable-libdbi +endif + define RSYSLOG_INSTALL_INIT_SYSTEMD $(INSTALL) -m 0644 -D package/rsyslog/rsyslog.service \ $(TARGET_DIR)/usr/lib/systemd/system/rsyslog.service From e6e16a6d1803956b0c10e0d92608980888d0ebd3 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 2 Dec 2023 09:37:38 +0100 Subject: [PATCH 69/93] =?UTF-8?q?DEVELOPERS:=20add=20Fl=C3=A1vio=20Tapaj?= =?UTF-8?q?=C3=B3s=20for=20rsyslog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 1f26e9bc81..2f3eedf8a0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1078,6 +1078,7 @@ F: package/python-pymodbus/ N: Flávio Tapajós F: configs/asus_tinker-s_rk3288_defconfig F: board/asus/tinker-s/ +F: package/rsyslog/ N: Florian Fainelli F: package/cpulimit/ From 7ceebff5b94f6a179e8ef77d467b1af0cc1bc477 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Dec 2023 16:06:46 +0100 Subject: [PATCH 70/93] package/elfutils: drop -lfts As spotted by Yann E. Morin in https://patchwork.ozlabs.org/project/buildroot/patch/20231022154133.1619344-1-bernd@kuhls.net, -lfts is not needed since bump to version 0.183 in commit ef92e86e845134868011cb0b801509a0755f855e and https://sourceware.org/git/?p=elfutils.git;a=commitdiff;h=da855fc9cd415c288bfcb9de1f3d5eb329de0557 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/elfutils/elfutils.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index 45df971071..24eb168894 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -51,7 +51,6 @@ endif ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) ELFUTILS_DEPENDENCIES += musl-fts argp-standalone -ELFUTILS_LDFLAGS += -lfts endif ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) From af2cd694e3903131d6e2f00646adfa83a89a23e2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Dec 2023 23:17:15 +0100 Subject: [PATCH 71/93] package/duma: bump to version 2.5.21 - Switch site to get latest release - Drop all patches (already in version) - Update hash of COPYING-LGPL, empty lines removed with https://github.com/johnsonjh/duma/commit/cceb1b2d808c36f02dfbfd774bcee0967fcc9392 - Pass $(TARGET_CONFIGURE_OPTS) to install targets to avoid using wrong values since https://github.com/johnsonjh/duma/commit/abdf4074c3dc506308283f5d463b17b4f58521f1 https://github.com/johnsonjh/duma/blob/VERSION_2_5_21/CHANGELOG Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .checkpackageignore | 4 -- package/duma/0001-fix-cross-compilation.patch | 37 ----------- package/duma/0002-no-tests.patch | 19 ------ package/duma/0003-fix-C++14.patch | 65 ------------------- .../0004-Fix-build-with-latest-glibc.patch | 22 ------- package/duma/Config.in | 2 +- package/duma/duma.hash | 4 +- package/duma/duma.mk | 11 ++-- 8 files changed, 9 insertions(+), 155 deletions(-) delete mode 100644 package/duma/0001-fix-cross-compilation.patch delete mode 100644 package/duma/0002-no-tests.patch delete mode 100644 package/duma/0003-fix-C++14.patch delete mode 100644 package/duma/0004-Fix-build-with-latest-glibc.patch diff --git a/.checkpackageignore b/.checkpackageignore index e9fdf9f01c..8c0190e3b3 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -338,10 +338,6 @@ package/dropbear/S50dropbear Indent Shellcheck Variables package/dt/0001-adjust-os-symlink.patch Upstream package/dt/0002-dt-default-source-define.patch Upstream package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch Upstream -package/duma/0001-fix-cross-compilation.patch Upstream -package/duma/0002-no-tests.patch Upstream -package/duma/0003-fix-C++14.patch Upstream -package/duma/0004-Fix-build-with-latest-glibc.patch Upstream package/dvb-apps/0001-Fix-generate-keynames.patch Upstream package/dvb-apps/0002-Fix-compiler-warning-flags.patch Upstream package/dvb-apps/0003-handle-static-shared-only-build.patch Upstream diff --git a/package/duma/0001-fix-cross-compilation.patch b/package/duma/0001-fix-cross-compilation.patch deleted file mode 100644 index eceaf06bec..0000000000 --- a/package/duma/0001-fix-cross-compilation.patch +++ /dev/null @@ -1,37 +0,0 @@ -Allow cross compilation. Adapted from crosstool-ng. - -Signed-off-by: Baruch Siach - -Index: b/GNUmakefile -=================================================================== ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -93,10 +93,6 @@ - # also define 'WIN32' - - # some defaults: --CC=gcc --CXX=g++ --AR=ar --RANLIB=ranlib - INSTALL=install - RM=rm - RMFORCE=rm -f -@@ -471,7 +467,7 @@ - - createconf$(EXEPOSTFIX): createconf.o - - $(RMFORCE) createconf$(EXEPOSTFIX) -- $(CC) $(CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf$(EXEPOSTFIX) -+ $(CC_FOR_BUILD) $(HOST_CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf$(EXEPOSTFIX) - - tstheap$(EXEPOSTFIX): libduma.a tstheap.o - - $(RMFORCE) tstheap$(EXEPOSTFIX) -@@ -532,7 +528,7 @@ - # define rules how to build objects for createconf - # - createconf.o: -- $(CC) $(CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@ -+ $(CC_FOR_BUILD) $(HOST_CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@ - - - # diff --git a/package/duma/0002-no-tests.patch b/package/duma/0002-no-tests.patch deleted file mode 100644 index 6fe76f725f..0000000000 --- a/package/duma/0002-no-tests.patch +++ /dev/null @@ -1,19 +0,0 @@ -Do not build test programs - -Biulding test programs does not work when we want to do a static link, -because duma.a redefines memcpy and strcpy, so the link fails. - -Signed-off-by: "Yann E. MORIN" - -diff -durN duma-2.5.15.orig/GNUmakefile duma-2.5.15/GNUmakefile ---- duma-2.5.15.orig/GNUmakefile 2014-11-16 14:47:05.874448560 +0100 -+++ duma-2.5.15/GNUmakefile 2014-11-16 14:54:50.792048921 +0100 -@@ -294,7 +294,7 @@ - SO_OBJECTS=dumapp_so.o duma_so.o sem_inc_so.o print_so.o - - # Make all the top-level targets the makefile knows about. --all: libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) thread-test$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS) -+all: libduma.a $(DUMA_DYN_DEPS) - - # Perform self tests on the program this makefile builds. - check test: diff --git a/package/duma/0003-fix-C++14.patch b/package/duma/0003-fix-C++14.patch deleted file mode 100644 index d19213ca7a..0000000000 --- a/package/duma/0003-fix-C++14.patch +++ /dev/null @@ -1,65 +0,0 @@ -dumapp: fix for C++14 - -With C++14, the way exceptions are specified has changed (somehow, don't -ask me), thus causing build failures: - - dumapp.cpp: In function ‘void* operator new(std::size_t)’: - dumapp.cpp:192:19: error: declaration of ‘void* operator new(std::size_t) throw (std::bad_alloc)’ has a different exception specifier - void * DUMA_CDECL operator new( DUMA_SIZE_T size ) - ^~~~~~~~ - In file included from dumapp.cpp:39:0: - dumapp.h:91:23: note: from previous declaration ‘void* operator new(std::size_t)’ - void * DUMA_CDECL operator new(DUMA_SIZE_T) throw(std::bad_alloc); - ^~~~~~~~ - -This is most evident with gcc-6.x, since the default C++ standard has -changed from C++11 to C++14, thus exposing these new failures. - -Fix that by guarding the exception handling, a bit like was done -with GRASS GIS (thanks DuckDuckGo): - - https://trac.osgeo.org/grass/changeset?old_path=%2F&old=68817&new_path=%2F&new=68818&sfp_email=&sfph_mail= - -Signed-off-by: "Yann E. MORIN" - ---- -Note: The last commit in DUMA's CVS repo was more than 7 years ago. -I doubt it is still active, so the patch was not sent upstream. :-/ - -diff -durN duma-2.5.15.orig/dumapp.cpp duma-2.5.15/dumapp.cpp ---- duma-2.5.15.orig/dumapp.cpp 2008-08-03 22:46:06.000000000 +0200 -+++ duma-2.5.15/dumapp.cpp 2016-07-10 21:55:22.670386099 +0200 -@@ -190,7 +190,9 @@ - * (11) = (a) ; ASW - */ - void * DUMA_CDECL operator new( DUMA_SIZE_T size ) -+#ifdef DUMA_EXCEPTION_SPECS - throw(std::bad_alloc) -+#endif - { - return duma_new_operator(size, EFA_NEW_ELEM, true DUMA_PARAMS_UK); - } -@@ -254,7 +256,9 @@ - * (21) = (a) ; AAW - */ - void * DUMA_CDECL operator new[]( DUMA_SIZE_T size ) -+#ifdef DUMA_EXCEPTION_SPECS - throw(std::bad_alloc) -+#endif - { - return duma_new_operator(size, EFA_NEW_ARRAY, true DUMA_PARAMS_UK); - } -diff -durN duma-2.5.15.orig/dumapp.h duma-2.5.15/dumapp.h ---- duma-2.5.15.orig/dumapp.h 2009-04-11 14:41:44.000000000 +0200 -+++ duma-2.5.15/dumapp.h 2016-07-10 21:55:22.670386099 +0200 -@@ -35,6 +35,10 @@ - - #include "duma.h" - -+#if __cplusplus < 201103L -+ #define DUMA_EXCEPTION_SPECS 1 -+#endif -+ - /* remove previous macro definitions */ - #include "noduma.h" - diff --git a/package/duma/0004-Fix-build-with-latest-glibc.patch b/package/duma/0004-Fix-build-with-latest-glibc.patch deleted file mode 100644 index 2d73d7ae57..0000000000 --- a/package/duma/0004-Fix-build-with-latest-glibc.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix build with latest glibc - -Fixes: - - http://autobuild.buildroot.net/results/c7de1a1d01edced2098a804ad87dcb67b5dc6832 - -Signed-off-by: Fabrice Fontaine - -diff -durN duma_2_5_15.orig/print.c duma_2_5_15/print.c ---- duma_2_5_15.orig/print.c 2019-10-28 10:21:14.080149620 +0100 -+++ duma_2_5_15/print.c 2019-10-28 10:22:01.256151561 +0100 -@@ -326,9 +326,9 @@ - if(DUMA_OUTPUT_FILE != NULL) - { - #if defined(WIN32) && !defined(__CYGWIN__) -- fd = _open(DUMA_OUTPUT_FILE, _O_APPEND|_O_CREAT|_O_WRONLY); -+ fd = _open(DUMA_OUTPUT_FILE, _O_APPEND|_O_CREAT|_O_WRONLY, 0600); - #else -- fd = open(DUMA_OUTPUT_FILE, O_APPEND|O_CREAT|O_WRONLY); -+ fd = open(DUMA_OUTPUT_FILE, O_APPEND|O_CREAT|O_WRONLY, 0600); - #endif - if ( fd >= 0 ) - { diff --git a/package/duma/Config.in b/package/duma/Config.in index b1f55faa73..a891996ad1 100644 --- a/package/duma/Config.in +++ b/package/duma/Config.in @@ -14,7 +14,7 @@ config BR2_PACKAGE_DUMA Electric Fence library. Detects buffer overflow and underflow, and also memory leaks. - http://duma.sourceforge.net + https://github.com/johnsonjh/duma if BR2_PACKAGE_DUMA diff --git a/package/duma/duma.hash b/package/duma/duma.hash index ccf171a97c..d6c1685bd1 100644 --- a/package/duma/duma.hash +++ b/package/duma/duma.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 baaf794854e3093ad1bddadbfb8ad4b220a7117d70359ee216bd59e353734e17 duma_2_5_15.tar.gz +sha256 470aa72e7018f0beadb5fbe3c932a62ba1b0594c29158a744c614bfa42133e59 duma-2.5.21.tar.gz sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING-GPL -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING-LGPL +sha256 76568dd3f7e12b18900ce0e767b99e59f4956a2e709a33de899508693a6425d4 COPYING-LGPL diff --git a/package/duma/duma.mk b/package/duma/duma.mk index 906db872d5..6bbdf41f4a 100644 --- a/package/duma/duma.mk +++ b/package/duma/duma.mk @@ -4,9 +4,8 @@ # ################################################################################ -DUMA_VERSION = 2.5.15 -DUMA_SOURCE = duma_$(subst .,_,$(DUMA_VERSION)).tar.gz -DUMA_SITE = http://downloads.sourceforge.net/project/duma/duma/$(DUMA_VERSION) +DUMA_VERSION = 2.5.21 +DUMA_SITE = $(call github,johnsonjh,duma,VERSION_$(subst .,_,$(DUMA_VERSION))) DUMA_LICENSE = GPL-2.0+, LGPL-2.1+ DUMA_LICENSE_FILES = COPYING-GPL COPYING-LGPL @@ -25,11 +24,13 @@ define DUMA_BUILD_CMDS endef define DUMA_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) OS=linux prefix=$(STAGING_DIR)/usr install -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + OS=linux prefix=$(STAGING_DIR)/usr install -C $(@D) endef define DUMA_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) OS=linux prefix=$(TARGET_DIR)/usr install -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + OS=linux prefix=$(TARGET_DIR)/usr install -C $(@D) endef $(eval $(generic-package)) From a4e713558dfd9a6fd6c0677b4b094adc216b720e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 2 Dec 2023 23:36:33 +0100 Subject: [PATCH 72/93] package/leptonica: bump to version 1.83.1 https://github.com/DanBloomberg/leptonica/compare/1.82.0...1.83.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/leptonica/leptonica.hash | 2 +- package/leptonica/leptonica.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/leptonica/leptonica.hash b/package/leptonica/leptonica.hash index 1220fbbd6e..6511d6b410 100644 --- a/package/leptonica/leptonica.hash +++ b/package/leptonica/leptonica.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 155302ee914668c27b6fe3ca9ff2da63b245f6d62f3061c8f27563774b8ae2d6 leptonica-1.82.0.tar.gz +sha256 8f18615e0743af7df7f50985c730dfcf0c93548073d1f56621e4156a8b54d3dd leptonica-1.83.1.tar.gz sha256 87829abb5bbb00b55a107365da89e9a33f86c4250169e5a1e5588505be7d5806 leptonica-license.txt diff --git a/package/leptonica/leptonica.mk b/package/leptonica/leptonica.mk index 8791b0c4c2..8eedf2fda9 100644 --- a/package/leptonica/leptonica.mk +++ b/package/leptonica/leptonica.mk @@ -4,8 +4,8 @@ # ################################################################################ -LEPTONICA_VERSION = 1.82.0 -LEPTONICA_SITE = http://www.leptonica.org/source +LEPTONICA_VERSION = 1.83.1 +LEPTONICA_SITE = https://github.com/DanBloomberg/leptonica/releases/download/$(LEPTONICA_VERSION) LEPTONICA_LICENSE = BSD-2-Clause LEPTONICA_LICENSE_FILES = leptonica-license.txt LEPTONICA_CPE_ID_VENDOR = leptonica From c9e5c1e80eff025768e347efbe5eb4d1dfd81ea9 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 27 Nov 2023 19:51:06 +0100 Subject: [PATCH 73/93] package/libnss: bump version to 3.95 Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- 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 50889f8d13..046f0efcca 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_94_RTM/src/SHA256SUMS -sha256 463ae180ee9e5ee9e3ad4f629326657e236780cc865572a930a16520abad9dd8 nss-3.94.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_95_RTM/src/SHA256SUMS +sha256 469888e41e8a780051ce00edcd914e8a6bd38da88a82cfb84898dd388635822a nss-3.95.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index e6f4d2f42a..878375e1b6 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.94 +LIBNSS_VERSION = 3.95 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 748a217c2521c1dd4248fd1b5507388f664e1984 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 2 Dec 2023 15:31:37 +0300 Subject: [PATCH 74/93] configs/linksprite_pcduino_defconfig: bump BSP versions Switch to the new Linux LTS release 6.6.3. Switch to the latest U-Boot 2023.10. Signed-off-by: Sergey Matyukevich Signed-off-by: Peter Korsgaard --- configs/linksprite_pcduino_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/linksprite_pcduino_defconfig b/configs/linksprite_pcduino_defconfig index cf58e021ba..2b215201cb 100644 --- a/configs/linksprite_pcduino_defconfig +++ b/configs/linksprite_pcduino_defconfig @@ -18,16 +18,16 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" # For kernel modules autoloading BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/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 @@ -40,7 +40,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Linksprite_pcDuino" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From 9fb563b491ed6eb515b2d9b2cb4654e6c3d8ffb9 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 2 Dec 2023 15:31:38 +0300 Subject: [PATCH 75/93] configs/orangepi_pc_plus: bump BSP versions Switch to the new Linux LTS release 6.6.3. Switch to the latest U-Boot 2023.10. Signed-off-by: Sergey Matyukevich Signed-off-by: Peter Korsgaard --- configs/orangepi_pc_plus_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig index 9dbf808da7..068eb09636 100644 --- a/configs/orangepi_pc_plus_defconfig +++ b/configs/orangepi_pc_plus_defconfig @@ -2,16 +2,16 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC_Plus" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC Plus" BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc-plus" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/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 @@ -21,7 +21,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc_plus" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From 593c259cde9ac646b70281a71336b6465dd39b37 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 2 Dec 2023 15:31:39 +0300 Subject: [PATCH 76/93] configs/orangepi_one_defconfig: bump BSP versions Switch to the new Linux LTS release 6.6.3. Switch to the latest U-Boot 2023.10. Signed-off-by: Sergey Matyukevich Signed-off-by: Peter Korsgaard --- configs/orangepi_one_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig index ea988e87ea..1431619620 100644 --- a/configs/orangepi_one_defconfig +++ b/configs/orangepi_one_defconfig @@ -1,16 +1,16 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_One" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi One" BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-one" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-h3-orangepi-one" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y @@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_one" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From 8e9681c52e448902c335418b9199cc6d9e23b726 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 2 Dec 2023 15:31:40 +0300 Subject: [PATCH 77/93] configs/orangepi_zero: bump BSP versions Switch to the new Linux LTS release 6.6.3. Switch to the latest U-Boot 2023.10. Signed-off-by: Sergey Matyukevich Signed-off-by: Peter Korsgaard --- ...RM-dts-orange-pi-zero-interrupt-triggering-xr819.patch | 8 ++++---- .../0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch | 8 ++++---- .../linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch | 8 ++++---- .../linux/0004-ARM-dts-orange-pi-zero-enable-uart.patch | 8 ++++---- configs/orangepi_zero_defconfig | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch b/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch index 16207afcb1..6a5aa0bb63 100644 --- a/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch +++ b/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch @@ -13,13 +13,13 @@ This commit specifies XR819 interrupt configuration for the driver. Signed-off-by: Sergey Matyukevich --- - arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 3 +++ + arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts index b7ca916d871d..4e1a9050c6b4 100644 ---- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts ++++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts @@ -125,6 +125,9 @@ */ xr819: sdio_wifi@1 { diff --git a/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch b/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch index e4c52ab911..ff0a1db223 100644 --- a/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch +++ b/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch @@ -10,13 +10,13 @@ For more information see: Signed-off-by: Sergey Matyukevich --- - arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 16 ++++++++++++++++ + arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) -diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts index 4e1a9050c6b4..cdf19821b1f3 100644 ---- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts ++++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts @@ -161,3 +161,19 @@ /* USB VBUS is always on */ status = "okay"; diff --git a/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch b/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch index ae0ed9ba3b..04d43c344f 100644 --- a/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch +++ b/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch @@ -8,13 +8,13 @@ This patch enables spidev driver for SPI1. Signed-off-by: Sergey Matyukevich --- - arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 11 +++++++++++ + arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 11 +++++++++++ 1 file changed, 11 insertions(+) -diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts index cdf19821b1f3..7242aaecb14f 100644 ---- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts ++++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts @@ -59,6 +59,7 @@ serial0 = &uart0; /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */ diff --git a/board/orangepi/orangepi-zero/patches/linux/0004-ARM-dts-orange-pi-zero-enable-uart.patch b/board/orangepi/orangepi-zero/patches/linux/0004-ARM-dts-orange-pi-zero-enable-uart.patch index 839bc16087..41c23209ce 100644 --- a/board/orangepi/orangepi-zero/patches/linux/0004-ARM-dts-orange-pi-zero-enable-uart.patch +++ b/board/orangepi/orangepi-zero/patches/linux/0004-ARM-dts-orange-pi-zero-enable-uart.patch @@ -7,13 +7,13 @@ Enable uart1 and uart2 on orange-pi-zero board. Signed-off-by: Sergey Kuzminov --- - arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 4 ++-- + arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts index f19ed981da9d..03acf166ab70 100644 ---- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts ++++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts @@ -184,13 +184,13 @@ &uart0 { &uart1 { pinctrl-names = "default"; diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index e286f0b7f1..596805bd47 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -8,16 +8,16 @@ 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_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_SYSTEM_DHCP="eth0" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" 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_INTREE_DTS_NAME="allwinner/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 @@ -31,7 +31,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From 026c8f80ff2294f08d70aa17d38b4be8c0c9d0de Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 2 Dec 2023 15:31:41 +0300 Subject: [PATCH 78/93] configs/orangepi_zero_plus2: update BSP versions Switch to the new Linux LTS release 6.6.3. Switch to the latest U-Boot 2023.10 and ATF 2.9. Increase ext2 partition size to fit new versions. Signed-off-by: Sergey Matyukevich Signed-off-by: Peter Korsgaard --- configs/orangepi_zero_plus2_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig index 377e9f1c59..990e16463f 100644 --- a/configs/orangepi_zero_plus2_defconfig +++ b/configs/orangepi_zero_plus2_defconfig @@ -2,14 +2,14 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_ROOTFS_OVERLAY="board/orangepi/orangepi-zero-plus2/rootfs_overlay" # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.8" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -17,7 +17,7 @@ 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="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y @@ -31,7 +31,7 @@ BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" 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,7 +56,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_TARGET_ROOTFS_EXT2_SIZE="128M" # host tools BR2_PACKAGE_HOST_GENIMAGE=y From ad21d833e0d0876f43e409548481c6030db2d16e Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 3 Dec 2023 18:58:56 +0200 Subject: [PATCH 79/93] package/socat: drop patch 2 As upstream developer mentioned in private communication, the code using NETDB_INTERNAL is now disabled. Remove the patch. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- .../0002-compat-set-NETDB_INTERNAL.patch | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 package/socat/0002-compat-set-NETDB_INTERNAL.patch diff --git a/package/socat/0002-compat-set-NETDB_INTERNAL.patch b/package/socat/0002-compat-set-NETDB_INTERNAL.patch deleted file mode 100644 index f526664210..0000000000 --- a/package/socat/0002-compat-set-NETDB_INTERNAL.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4b86f141c7c4725093fb2e12c769fec393727519 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sun, 28 Aug 2016 21:04:01 +0200 -Subject: [PATCH] compat: set NETDB_INTERNAL - -Musl doesn't provide NETDB_INTERNAL which is defined in resolv/netdb.h -in Glibc [1]. - -Set NETDB_INTERNAL to -1 locally if not already defined. -Based on [2]. - -[1] https://sourceware.org/git/?p=glibc.git;a=blob;f=resolv/netdb.h;h=3aba530932c7a62a4f23e3193e9186da677f552b;hb=fdfc9260b61d3d72541f18104d24c7bcb0ce5ca2#l74 -[2] http://git.alpinelinux.org/cgit/aports/tree/main/socat/netdb-internal.patch?id=5a45173b50892cb634197c30b3506ebff98d3b7d - -Upstream: sent to socat@dest-unreach.org -Signed-off-by: Romain Naour ---- - compat.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/compat.h b/compat.h -index bb7e2d8f1782..72e73c701f64 100644 ---- a/compat.h -+++ b/compat.h -@@ -851,6 +851,8 @@ typedef unsigned long T_sigset; - - #if !defined(NETDB_INTERNAL) && defined(h_NETDB_INTERNAL) - # define NETDB_INTERNAL h_NETDB_INTERNAL -+#elif !defined(NETDB_INTERNAL) -+# define NETDB_INTERNAL (-1) - #endif - - #ifndef INET_ADDRSTRLEN --- -2.5.5 - From 56fd7854342911b737478667a183958119166a18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Wed, 22 Nov 2023 02:41:07 +0100 Subject: [PATCH 80/93] Revert "board/raspberrypi: handle dtb overlays for all variants" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 6021f3678b44d43da7057e3135da842cde1ffa05. That change is no more relevant since the genimage.cfg files are generated by the commit e37ee5acdc (board/raspberrypi/post-image.sh: generate genimage config from template if not present), and since the variant-specific files were dropped off by the commit fc5cdeed72 (board/raspberrypi: drop variant-specific genimage files). This removes the very last alive piece of change of the commit 6021f3678b (board/raspberrypi: handle dtb overlays for all variants); the commit is fully reverted now. Signed-off-by: Gaël PORTAY Signed-off-by: Peter Korsgaard --- board/raspberrypi/post-build.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/board/raspberrypi/post-build.sh b/board/raspberrypi/post-build.sh index 0bd7bc3d17..73026e5922 100755 --- a/board/raspberrypi/post-build.sh +++ b/board/raspberrypi/post-build.sh @@ -14,6 +14,3 @@ elif [ -d ${TARGET_DIR}/etc/systemd ]; then ln -sf /lib/systemd/system/getty@.service \ "${TARGET_DIR}/etc/systemd/system/getty.target.wants/getty@tty1.service" fi - -# ensure overlays exists for genimage -mkdir -p "${BINARIES_DIR}/rpi-firmware/overlays" From f1de35e2a0ea2496a920d0b28b5986ffb50f0640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Wed, 22 Nov 2023 02:41:08 +0100 Subject: [PATCH 81/93] Revert "Fix rasberry Pi 64bit firmware overlay inclusion" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 51d6d6c580432435f2b2f95ed35e22a5ecbe9dcb. That change is no more relevant since the genimage.cfg files are generated by the commit e37ee5acdc (board/raspberrypi/post-image.sh: generate genimage config from template if not present), and since the variant-specific files were dropped off by the commit fc5cdeed72 (board/raspberrypi: drop variant-specific genimage files). This removes the very last alive piece of change of the commit 51d6d6c580 (Fix rasberry Pi 64bit firmware overlay inclusion); the commit is fully reverted now. Signed-off-by: Gaël PORTAY Signed-off-by: Peter Korsgaard --- package/rpi-firmware/rpi-firmware.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 37e010d1de..11177aee02 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -59,12 +59,6 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb $(BINARIES_DIR)/rpi-firmware/overlays/ touch $(BINARIES_DIR)/rpi-firmware/overlays/README endef -else -# Still create the directory, so a genimage.cfg can include it independently of -# whether _INSTALL_DTB_OVERLAYS is selected or not. -define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS - $(INSTALL) -d $(BINARIES_DIR)/rpi-firmware/overlays -endef endif # Install prebuilt libraries if RPI_USERLAND not enabled From a9d03feed642a860c11122a0b0ab32365201fc40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Wed, 22 Nov 2023 02:06:10 +0100 Subject: [PATCH 82/93] board/raspberrypi/readme.txt: add pi0w hint MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gaël PORTAY Signed-off-by: Peter Korsgaard --- board/raspberrypi/readme.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index c81fd801ae..ebcf8da588 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -28,6 +28,10 @@ For model Zero (model A+ in smaller form factor): $ make raspberrypi0_defconfig +or for model Zero W (model Zero with wireless LAN and Bluetooth): + + $ make raspberrypi0w_defconfig + For model Zero 2 W (model B3 in smaller form factor): $ make raspberrypizero2w_defconfig From 302199957705ae9b63741ce8a571b706bcc577e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Tue, 7 Nov 2023 14:16:26 +0100 Subject: [PATCH 83/93] package/linux-firmware: add RTL8851/RTL8852 firmware MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add firmware files for RTL8851 and RTL8852 cards used by the rtlbt driver. Signed-off-by: Jan ÄŒermák Signed-off-by: Peter Korsgaard --- package/linux-firmware/linux-firmware.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index c2cf0fec19..96905dd909 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -90,7 +90,12 @@ LINUX_FIRMWARE_FILES += \ rtl_bt/rtl8821c_config.bin rtl_bt/rtl8821c_fw.bin \ rtl_bt/rtl8822b_config.bin rtl_bt/rtl8822b_fw.bin \ rtl_bt/rtl8822cs_config.bin rtl_bt/rtl8822cs_fw.bin \ - rtl_bt/rtl8822cu_config.bin rtl_bt/rtl8822cu_fw.bin + rtl_bt/rtl8822cu_config.bin rtl_bt/rtl8822cu_fw.bin \ + rtl_bt/rtl8851bu_fw.bin rtl_bt/rtl8851bu_config.bin \ + rtl_bt/rtl8852au_fw.bin rtl_bt/rtl8852au_config.bin \ + rtl_bt/rtl8852bu_fw.bin rtl_bt/rtl8852bu_config.bin \ + rtl_bt/rtl8852cu_fw.bin rtl_bt/rtl8852cu_config.bin \ + rtl_bt/rtl8852cu_fw_v2.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt endif From c8a5a97e6740e31ef62e1be9f7c640dde79db6d4 Mon Sep 17 00:00:00 2001 From: Francis Laniel Date: Mon, 20 Nov 2023 14:54:43 +0100 Subject: [PATCH 84/93] package/tbb: bump to version 2021.11.0. Signed-off-by: Francis Laniel Signed-off-by: Peter Korsgaard --- package/tbb/tbb.hash | 2 +- package/tbb/tbb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tbb/tbb.hash b/package/tbb/tbb.hash index 085d54109a..4d2cb10da8 100644 --- a/package/tbb/tbb.hash +++ b/package/tbb/tbb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 487023a955e5a3cc6d3a0d5f89179f9b6c0ae7222613a7185b0227ba0c83700b tbb-2021.10.0.tar.gz +sha256 782ce0cab62df9ea125cdea253a50534862b563f1d85d4cda7ad4e77550ac363 tbb-2021.11.0.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE.txt diff --git a/package/tbb/tbb.mk b/package/tbb/tbb.mk index 75cca5e99d..1b0afbb889 100644 --- a/package/tbb/tbb.mk +++ b/package/tbb/tbb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TBB_VERSION = 2021.10.0 +TBB_VERSION = 2021.11.0 TBB_SITE = $(call github,01org,tbb,v$(TBB_VERSION)) TBB_INSTALL_STAGING = YES TBB_LICENSE = Apache-2.0 From 029099025f81baaa6b8296bada22878751fa5025 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 21 Nov 2023 23:07:06 +0100 Subject: [PATCH 85/93] package/libblockdev: drop unrecognized options The following options were wrongly kept when bumping to version 3.0.3 in commit 18420d9b6b424492741cba495cc2e7a28a409e8b: - dmraid (dropped since https://github.com/storaged-project/libblockdev/commit/d174944a85169efae3bac0b6e76498e3d0c6c240) - bcache and kbd (dropped since https://github.com/storaged-project/libblockdev/commit/c1ff1c87e31fb2820a5694637eb221f590eb9451) - python2 (dropped since https://github.com/storaged-project/libblockdev/commit/8fc33b834529d3d18a73112e4c77ea0a5d26d62c) - vdo (dropped since https://github.com/storaged-project/libblockdev/commit/e51faac2a952da33925e3ccab0f4f0fdf3986cd3) Signed-off-by: Fabrice Fontaine Reviewed-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/libblockdev/libblockdev.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/package/libblockdev/libblockdev.mk b/package/libblockdev/libblockdev.mk index 3bbc221cc5..e0fca2b95c 100644 --- a/package/libblockdev/libblockdev.mk +++ b/package/libblockdev/libblockdev.mk @@ -16,20 +16,15 @@ LIBBLOCKDEV_AUTORECONF = YES LIBBLOCKDEV_CONF_OPTS = \ --disable-introspection \ --with-loop \ - --without-bcache \ --without-btrfs \ --without-dm \ - --without-dmraid \ --without-escrow \ - --without-kbd \ --without-lvm_dbus \ --without-mpath \ --without-nvdimm \ - --without-python2 \ --without-python3 \ --without-s390 \ - --without-tools \ - --without-vdo + --without-tools ifeq ($(BR2_PACKAGE_LIBBLOCKDEV_CRYPTO),y) LIBBLOCKDEV_DEPENDENCIES += cryptsetup keyutils From b7ff789e0e5e5e40bbf4bd0145100a842df16ccc Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Thu, 26 Oct 2023 12:50:34 +0100 Subject: [PATCH 86/93] configs/zynqmp_kria_kr260_defconfig: new defconfig This patch adds support for Xilinx Kria KR260 starter kit. KR260 features can be found here: https://www.xilinx.com/products/som/kria/kr260-robotics-starter-kit.html While the Kria SOM is based on a ZynqMP SoC, there are some key boot config differences from the other ZynqMP evaluation boards. 1. There are no boot switches on Kria SOMs. The boot mode is thus hard configured for QSPI flash. A pre-programmed boot.bin comes with every Starter Kit. U-Boot can then find the Linux kernel and file system on the SD card. Optional instructions for updating the boot.bin in the QSPI flash can be found in the readme.txt file and the link below. https://xilinx-wiki.atlassian.net/wiki/spaces/A/pages/1641152513/Kria+K26+SOM 2. Kria SOMs use UART1 for the console instead of UART0. For this reason, Kria Starter Kits will use a separate extlinux.conf file from other ZynqMP evaluation boards. 3. The KR260 has a USB to SD card bridge, so the Linux kernel and file system are found on /dev/sda1 and /dev/sda2. Signed-off-by: Neal Frager [Peter: fix kr260.sh shellcheck warnings, similar to kv260.sh] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + board/zynqmp/kria/kr260/kr260.sh | 16 + board/zynqmp/kria/kr260/pm_cfg_obj.c | 496 +++++++++++++++++++++++++++ board/zynqmp/kria/readme.txt | 29 +- configs/zynqmp_kria_kr260_defconfig | 42 +++ 5 files changed, 578 insertions(+), 6 deletions(-) create mode 100755 board/zynqmp/kria/kr260/kr260.sh create mode 100644 board/zynqmp/kria/kr260/pm_cfg_obj.c create mode 100644 configs/zynqmp_kria_kr260_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 2f3eedf8a0..0500c5f7ce 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2212,6 +2212,7 @@ F: board/zynqmp/ F: configs/versal_vck190_defconfig F: configs/zynq_zc702_defconfig F: configs/zynq_zc706_defconfig +F: configs/zynqmp_kria_kr260_defconfig F: configs/zynqmp_kria_kv260_defconfig F: configs/zynqmp_zcu102_defconfig F: configs/zynqmp_zcu106_defconfig diff --git a/board/zynqmp/kria/kr260/kr260.sh b/board/zynqmp/kria/kr260/kr260.sh new file mode 100755 index 0000000000..ac49fa5ee4 --- /dev/null +++ b/board/zynqmp/kria/kr260/kr260.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +# This is a temporary work around for generating kr260 u-boot.itb. +# The problem is there is no way to currently configure u-boot to apply +# the carrier board dtb overlay during build, so all kr260 carrier board +# drivers are missing. +# This will be removed when u-boot can build the kr260 u-boot.itb natively. + +UBOOT_DIR="$4" + +fdtoverlay -o "${UBOOT_DIR}/fit-dtb.blob" \ + -i "${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k26-revA.dtb" \ + "${UBOOT_DIR}/arch/arm/dts/zynqmp-sck-kr-g-revB.dtbo" + +"${UBOOT_DIR}/tools/mkimage" -E -f "${UBOOT_DIR}/u-boot.its" \ + -B 0x8 "${BINARIES_DIR}/u-boot.itb" diff --git a/board/zynqmp/kria/kr260/pm_cfg_obj.c b/board/zynqmp/kria/kr260/pm_cfg_obj.c new file mode 100644 index 0000000000..9692a30d37 --- /dev/null +++ b/board/zynqmp/kria/kr260/pm_cfg_obj.c @@ -0,0 +1,496 @@ +/****************************************************************************** +* 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 */ + 35, /* 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, + 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_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_ETH_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_ETH_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_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_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_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_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_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_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_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_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, + 10, + 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_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_35_MAP | + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif + diff --git a/board/zynqmp/kria/readme.txt b/board/zynqmp/kria/readme.txt index bea1430482..dc6915f081 100644 --- a/board/zynqmp/kria/readme.txt +++ b/board/zynqmp/kria/readme.txt @@ -3,14 +3,17 @@ Xilinx Kria SOM Starter Kits - ZynqMP SoC ************************************************** This document describes the Buildroot support for the Kria -KV260 starter kit by Xilinx, based on Kria SOM including the +KV260 and KR260 starter kits by Xilinx, based on Kria SOM including the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been tested with -the KV260 production board. +the KV260 and KR260 production boards. -Evaluation board features can be found here with the link below. +Evaluation board features can be found here with the links below. KV260: -https://www.xilinx.com/products/boards-and-kits/kv260.html +https://www.xilinx.com/products/som/kria/kv260-vision-starter-kit.html + +KR260: +https://www.xilinx.com/products/som/kria/kr260-robotics-starter-kit.html How to build it =============== @@ -65,7 +68,7 @@ in that the boot.bin and u-boot.itb files need to be flashed into the QSPI boot flash such that U-Boot can then load all of the remaining images from the SD card. -In addition, the KV260 Starter Kit QSPI comes pre-flashed with +In addition, the KV260 and KR260 Starter Kits QSPI comes pre-flashed with a utility designed to make updating the QSPI flash memory easier. @@ -76,8 +79,9 @@ https://xilinx-wiki.atlassian.net/wiki/spaces/A/pages/1641152513/Kria+K26+SOM#Bo Additionally, it is possible to use u-boot for updating the QSPI with new boot.bin and u-boot.itb images with the u-boot -commands below: +commands below. +KV260 Flashing Instructions: Flashing u-boot.itb: $ sf probe $ fatload mmc 1 0x1000000 u-boot.itb @@ -90,5 +94,18 @@ Flashing boot.bin: $ sf erase 0x200000 +$filesize $ sf write 0x1000000 0x200000 $filesize +KR260 Flashing Instructions: +Flashing u-boot.itb: + $ sf probe + $ fatload usb 0 0x1000000 u-boot.itb + $ sf erase 0xf80000 +$filesize + $ sf write 0x1000000 0xf80000 $filesize + +Flashing boot.bin: + $ sf probe + $ fatload usb 0 0x1000000 boot.bin + $ sf erase 0x200000 +$filesize + $ sf write 0x1000000 0x200000 $filesize + It is possible to boot the Buildroot generated SD card image without updating the QSPI boot.bin image, so this is an optional step. diff --git a/configs/zynqmp_kria_kr260_defconfig b/configs/zynqmp_kria_kr260_defconfig new file mode 100644 index 0000000000..2089c3f355 --- /dev/null +++ b/configs/zynqmp_kria_kr260_defconfig @@ -0,0 +1,42 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh board/zynqmp/kria/kr260/kr260.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2 ${UBOOT_DIR}" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kr-g-revB" +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_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/kria/uboot.fragment" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k26-revA" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=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/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/kr260-kria/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kr260/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 +BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches" From 075a65a4e1dd0ede3002fa47a2b6cafcea75edb9 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Thu, 16 Nov 2023 12:23:22 +0000 Subject: [PATCH 87/93] configs/zynqmp_zcu102_defconfig: bump to xilinx-v2023.2 This patch bumps the zynqmp_zcu102_defconfig to xilinx-v2023.2 which includes the following updates: - Linux v6.1.30 with additional bug fixes - U-Boot v2023.01 with additional bug fixes - ATF v2.8 with additional bug fixes - PMUFW xilinx_v2023.2 Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- configs/zynqmp_zcu102_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 18230cf89b..c920093d8d 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_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.1)/xlnx_rebase_v6.1_LTS_2023.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" @@ -15,13 +15,13 @@ 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_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.1)/xlnx_rebase_v2.8_2023.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.tar.gz" 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_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.1)/xlnx_rebase_v2023.01_2023.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu102-rev1.0" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -30,7 +30,7 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=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/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.1/zcu102-zynqmp/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/zcu102-zynqmp/pmufw.elf" 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 From 2d194122d1e3ede39f37a7000e73def0b7d89e9c Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Thu, 16 Nov 2023 12:23:23 +0000 Subject: [PATCH 88/93] configs/zynqmp_zcu106_defconfig: bump to xilinx-v2023.2 This patch bumps the zynqmp_zcu106_defconfig to xilinx-v2023.2 which includes the following updates: - Linux v6.1.30 with additional bug fixes - U-Boot v2023.01 with additional bug fixes - ATF v2.8 with additional bug fixes - PMUFW xilinx_v2023.2 Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- configs/zynqmp_zcu106_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 21f41a2d8f..011c7f0fae 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_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.1)/xlnx_rebase_v6.1_LTS_2023.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" @@ -15,13 +15,13 @@ 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_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.1)/xlnx_rebase_v2.8_2023.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.tar.gz" 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_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.1)/xlnx_rebase_v2023.01_2023.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-revA" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -30,7 +30,7 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=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/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.1/zcu106-zynqmp/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/zcu106-zynqmp/pmufw.elf" 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 From 43a9d03a7ba8478fcbe8e6d7a9b7117eb76cfe9a Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Thu, 16 Nov 2023 12:23:24 +0000 Subject: [PATCH 89/93] configs/zynqmp_kria_kv260_defconfig: bump to xilinx-v2023.2 This patch bumps the zynqmp_kria_kv260_defconfig to xilinx-v2023.2 which includes the following updates: - Linux v6.1.30 with additional bug fixes - U-Boot v2023.01 with additional bug fixes - ATF v2.8 with additional bug fixes - PMUFW xilinx_v2023.2 Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- configs/zynqmp_kria_kv260_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index 78b62a9ff8..a3a157267c 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 mmcblk1p2 ${UBOOT_DIR}" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.1)/xlnx_rebase_v6.1_LTS_2023.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kv-g-revB" @@ -15,14 +15,14 @@ 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_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.1)/xlnx_rebase_v2.8_2023.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=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,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.1)/xlnx_rebase_v2023.01_2023.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/kria/uboot.fragment" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k26-revA" @@ -32,7 +32,7 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=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/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.1/kv260-kria/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/kv260-kria/pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kv260/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y From eadde4d23c3c35d6b1a3fe4e3d294e8167f34252 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Thu, 16 Nov 2023 12:36:51 +0000 Subject: [PATCH 90/93] configs/versal_vck190_defconfig: bump to xilinx-v2023.2 This patch bumps the versal_vck190_defconfig to xilinx-v2023.2 which includes the following updates: - Linux v6.1.30 with additional bug fixes - U-Boot v2023.01 with additional bug fixes - ATF v2.8 with additional bug fixes - PLM xilinx_v2023.2 - PSMFW xilinx_v2023.2 Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- configs/versal_vck190_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig index e30bb35b74..8561b6641a 100644 --- a/configs/versal_vck190_defconfig +++ b/configs/versal_vck190_defconfig @@ -6,7 +6,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.1)/xlnx_rebase_v6.1_LTS_2023.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vck190-rev1.1" @@ -16,7 +16,7 @@ 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_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.1)/xlnx_rebase_v2.8_2023.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="versal" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y @@ -24,7 +24,7 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=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,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.1)/xlnx_rebase_v2023.01_2023.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_versal_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vck190-rev1.1" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -33,7 +33,7 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y BR2_TARGET_UBOOT_FORMAT_DTB=y BR2_PACKAGE_VERSAL_FIRMWARE=y -BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="xilinx_v2023.1" +BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="xilinx_v2023.2" BR2_PACKAGE_VERSAL_FIRMWARE_BOARD="vck190" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y From 790d554474c5a999d2996dc532bc042631ef16f2 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Thu, 16 Nov 2023 13:01:31 +0000 Subject: [PATCH 91/93] configs/zynq_qmtech_defconfig: deprecate board The zynq_qmtech_defconfig has not been maintained for 3 years, and is now using a very out of date u-boot and Linux kernel. Since there are 4 other zynq7000 defconfigs available in buildroot and Julien no longer has a functional board, drop the defconfig. Signed-off-by: Neal Frager Acked-by: Julien Olivain [Peter: reword commit message] Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - DEVELOPERS | 2 - ...0001-DTS-for-QMTech-Zynq-starter-kit.patch | 418 ------------------ board/qmtech/zynq/readme.txt | 76 ---- configs/zynq_qmtech_defconfig | 33 -- 5 files changed, 530 deletions(-) delete mode 100644 board/qmtech/zynq/patches/linux/0001-DTS-for-QMTech-Zynq-starter-kit.patch delete mode 100644 board/qmtech/zynq/readme.txt delete mode 100644 configs/zynq_qmtech_defconfig diff --git a/.checkpackageignore b/.checkpackageignore index 8c0190e3b3..399d6b6689 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -76,7 +76,6 @@ board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch Upstream board/qemu/x86/post-build.sh Shellcheck board/qemu/x86_64/post-build.sh Shellcheck -board/qmtech/zynq/patches/linux/0001-DTS-for-QMTech-Zynq-starter-kit.patch Upstream board/radxa/rockpi-n8/post-build.sh Shellcheck board/raspberrypi/post-build.sh Shellcheck board/raspberrypi/post-image.sh Shellcheck diff --git a/DEVELOPERS b/DEVELOPERS index 0500c5f7ce..b40eab1bf9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1708,14 +1708,12 @@ F: configs/ts7680_defconfig F: package/paho-mqtt-c N: Julien Olivain -F: board/qmtech/zynq/ F: board/spike/ F: board/technexion/imx8mmpico/ F: board/technexion/imx8mpico/ F: configs/imx8mmpico_defconfig F: configs/imx8mpico_defconfig F: configs/spike_riscv64_defconfig -F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ F: package/glslsandbox-player/ diff --git a/board/qmtech/zynq/patches/linux/0001-DTS-for-QMTech-Zynq-starter-kit.patch b/board/qmtech/zynq/patches/linux/0001-DTS-for-QMTech-Zynq-starter-kit.patch deleted file mode 100644 index 86d8e387de..0000000000 --- a/board/qmtech/zynq/patches/linux/0001-DTS-for-QMTech-Zynq-starter-kit.patch +++ /dev/null @@ -1,418 +0,0 @@ -From 22d955122ac0f7ac74ab74aadebf6b8edaf0bbbd Mon Sep 17 00:00:00 2001 -From: Julien Olivain -Date: Sun, 15 Dec 2019 18:45:40 +0100 -Subject: [PATCH] DTS for QMTech Zynq starter kit - -Signed-off-by: Martin Chabot -Signed-off-by: Julien Olivain ---- - arch/arm/boot/dts/zynq-qmtech.dts | 397 ++++++++++++++++++++++++++++++ - 1 file changed, 397 insertions(+) - create mode 100644 arch/arm/boot/dts/zynq-qmtech.dts - -diff --git a/arch/arm/boot/dts/zynq-qmtech.dts b/arch/arm/boot/dts/zynq-qmtech.dts -new file mode 100644 -index 000000000000..c6081dc0080e ---- /dev/null -+++ b/arch/arm/boot/dts/zynq-qmtech.dts -@@ -0,0 +1,397 @@ -+// SPDX-License-Identifier: GPL-2.0+ -+/* -+ * Copyright (C) 2011 - 2015 Xilinx -+ * Copyright (C) 2012 National Instruments Corp. -+ * Copyright (C) 2019 Martin Chabot -+ */ -+ -+/* Derived from: -+ * https://github.com/Xilinx/linux-xlnx/blob/xilinx-v2019.2.01/arch/arm/boot/dts/zynq-zc702.dts -+ */ -+ -+/dts-v1/; -+#include "zynq-7000.dtsi" -+ -+/ { -+ model = "QMTECH XC7Z010 Starter Kit"; -+ compatible = "xlnx,zynq-qmtech", "xlnx,zynq-zc702", "xlnx,zynq-7000"; -+ -+ aliases { -+ ethernet0 = &gem0; -+ i2c0 = &i2c0; -+ serial0 = &uart1; -+ spi0 = &qspi; -+ mmc0 = &sdhci0; -+ }; -+ -+ memory@0 { -+ device_type = "memory"; -+ reg = <0x0 0x20000000>; -+ }; -+ -+ chosen { -+ bootargs = ""; -+ stdout-path = "serial0:115200n8"; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ ds23 { -+ label = "ds23"; -+ gpios = <&gpio0 10 0>; -+ linux,default-trigger = "heartbeat"; -+ }; -+ }; -+ -+}; -+ -+&amba { -+ ocm: sram@fffc0000 { -+ compatible = "mmio-sram"; -+ reg = <0xfffc0000 0x10000>; -+ }; -+}; -+ -+&clkc { -+ ps-clk-frequency = <33333333>; -+}; -+ -+&gem0 { -+ status = "okay"; -+ phy-mode = "rgmii-id"; -+ phy-handle = <ðernet_phy>; -+ -+ ethernet_phy: ethernet-phy@0 { -+ reg = <0>; -+ device_type = "ethernet-phy"; -+ }; -+}; -+ -+&gpio0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_gpio0_default>; -+}; -+ -+&i2c0 { -+ status = "disabled"; -+ clock-frequency = <400000>; -+ pinctrl-names = "default", "gpio"; -+ pinctrl-0 = <&pinctrl_i2c0_default>; -+ pinctrl-1 = <&pinctrl_i2c0_gpio>; -+ scl-gpios = <&gpio0 50 0>; -+ sda-gpios = <&gpio0 51 0>; -+ -+ i2c-mux@74 { -+ compatible = "nxp,pca9548"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <0x74>; -+ -+ i2c@0 { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <0>; -+ si570: clock-generator@5d { -+ #clock-cells = <0>; -+ compatible = "silabs,si570"; -+ temperature-stability = <50>; -+ reg = <0x5d>; -+ factory-fout = <156250000>; -+ clock-frequency = <148500000>; -+ }; -+ }; -+ -+ i2c@1 { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <1>; -+ adv7511: hdmi-tx@39 { -+ compatible = "adi,adv7511"; -+ reg = <0x39>; -+ adi,input-depth = <8>; -+ adi,input-colorspace = "yuv422"; -+ adi,input-clock = "1x"; -+ adi,input-style = <3>; -+ adi,input-justification = "right"; -+ }; -+ }; -+ -+ i2c@2 { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <2>; -+ eeprom@54 { -+ compatible = "atmel,24c08"; -+ reg = <0x54>; -+ }; -+ }; -+ -+ i2c@3 { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <3>; -+ gpio@21 { -+ compatible = "ti,tca6416"; -+ reg = <0x21>; -+ gpio-controller; -+ #gpio-cells = <2>; -+ }; -+ }; -+ -+ i2c@4 { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <4>; -+ rtc@51 { -+ compatible = "nxp,pcf8563"; -+ reg = <0x51>; -+ }; -+ }; -+ -+ i2c@7 { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <7>; -+ hwmon@52 { -+ compatible = "ti,ucd9248"; -+ reg = <52>; -+ }; -+ hwmon@53 { -+ compatible = "ti,ucd9248"; -+ reg = <53>; -+ }; -+ hwmon@54 { -+ compatible = "ti,ucd9248"; -+ reg = <54>; -+ }; -+ }; -+ }; -+}; -+ -+&pinctrl0 { -+ pinctrl_can0_default: can0-default { -+ mux { -+ function = "can0"; -+ groups = "can0_9_grp"; -+ }; -+ -+ conf { -+ groups = "can0_9_grp"; -+ slew-rate = <0>; -+ io-standard = <1>; -+ }; -+ -+ conf-rx { -+ pins = "MIO46"; -+ bias-high-impedance; -+ }; -+ -+ conf-tx { -+ pins = "MIO47"; -+ bias-disable; -+ }; -+ }; -+ -+ pinctrl_gem0_default: gem0-default { -+ mux { -+ function = "ethernet0"; -+ groups = "ethernet0_0_grp"; -+ }; -+ -+ conf { -+ groups = "ethernet0_0_grp"; -+ slew-rate = <0>; -+ io-standard = <4>; -+ }; -+ -+ conf-rx { -+ pins = "MIO22", "MIO23", "MIO24", "MIO25", "MIO26", "MIO27"; -+ bias-high-impedance; -+ low-power-disable; -+ }; -+ -+ conf-tx { -+ pins = "MIO16", "MIO17", "MIO18", "MIO19", "MIO20", "MIO21"; -+ bias-disable; -+ low-power-enable; -+ }; -+ -+ mux-mdio { -+ function = "mdio0"; -+ groups = "mdio0_0_grp"; -+ }; -+ -+ conf-mdio { -+ groups = "mdio0_0_grp"; -+ slew-rate = <0>; -+ io-standard = <1>; -+ bias-disable; -+ }; -+ }; -+ -+ pinctrl_gpio0_default: gpio0-default { -+ mux { -+ function = "gpio0"; -+ groups = "gpio0_7_grp", "gpio0_8_grp", "gpio0_9_grp", -+ "gpio0_10_grp", "gpio0_11_grp", "gpio0_12_grp", -+ "gpio0_13_grp", "gpio0_14_grp"; -+ }; -+ -+ conf { -+ groups = "gpio0_7_grp", "gpio0_8_grp", "gpio0_9_grp", -+ "gpio0_10_grp", "gpio0_11_grp", "gpio0_12_grp", -+ "gpio0_13_grp", "gpio0_14_grp"; -+ slew-rate = <0>; -+ io-standard = <1>; -+ }; -+ -+ conf-pull-up { -+ pins = "MIO9", "MIO10", "MIO11", "MIO12", "MIO13", "MIO14"; -+ bias-pull-up; -+ }; -+ -+ conf-pull-none { -+ pins = "MIO7", "MIO8"; -+ bias-disable; -+ }; -+ }; -+ -+ pinctrl_i2c0_default: i2c0-default { -+ mux { -+ groups = "i2c0_10_grp"; -+ function = "i2c0"; -+ }; -+ -+ conf { -+ groups = "i2c0_10_grp"; -+ bias-pull-up; -+ slew-rate = <0>; -+ io-standard = <1>; -+ }; -+ }; -+ -+ pinctrl_i2c0_gpio: i2c0-gpio { -+ mux { -+ groups = "gpio0_50_grp", "gpio0_51_grp"; -+ function = "gpio0"; -+ }; -+ -+ conf { -+ groups = "gpio0_50_grp", "gpio0_51_grp"; -+ slew-rate = <0>; -+ io-standard = <1>; -+ }; -+ }; -+ -+ pinctrl_sdhci0_default: sdhci0-default { -+ mux { -+ groups = "sdio0_2_grp"; -+ function = "sdio0"; -+ }; -+ -+ conf { -+ groups = "sdio0_2_grp"; -+ slew-rate = <0>; -+ io-standard = <1>; -+ bias-disable; -+ }; -+ -+ mux-cd { -+ groups = "gpio0_0_grp"; -+ function = "sdio0_cd"; -+ }; -+ -+ conf-cd { -+ groups = "gpio0_0_grp"; -+ bias-high-impedance; -+ bias-pull-up; -+ slew-rate = <0>; -+ io-standard = <1>; -+ }; -+ -+ mux-wp { -+ groups = "gpio0_15_grp"; -+ function = "sdio0_wp"; -+ }; -+ -+ conf-wp { -+ groups = "gpio0_15_grp"; -+ bias-high-impedance; -+ bias-pull-up; -+ slew-rate = <0>; -+ io-standard = <1>; -+ }; -+ }; -+ -+ pinctrl_uart1_default: uart1-default { -+ mux { -+ groups = "uart1_10_grp"; -+ function = "uart1"; -+ }; -+ -+ conf { -+ groups = "uart1_10_grp"; -+ slew-rate = <0>; -+ io-standard = <1>; -+ }; -+ -+ conf-rx { -+ pins = "MIO25"; -+ bias-high-impedance; -+ }; -+ -+ conf-tx { -+ pins = "MIO24"; -+ bias-disable; -+ }; -+ }; -+}; -+ -+&qspi { -+ u-boot,dm-pre-reloc; -+ status = "disabled"; -+ is-dual = <0>; -+ num-cs = <1>; -+ flash@0 { -+ compatible = "n25q128a11"; -+ reg = <0x0>; -+ spi-tx-bus-width = <1>; -+ spi-rx-bus-width = <4>; -+ spi-max-frequency = <50000000>; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ partition@qspi-fsbl-uboot { -+ label = "qspi-fsbl-uboot"; -+ reg = <0x0 0x100000>; -+ }; -+ partition@qspi-linux { -+ label = "qspi-linux"; -+ reg = <0x100000 0x500000>; -+ }; -+ partition@qspi-device-tree { -+ label = "qspi-device-tree"; -+ reg = <0x600000 0x20000>; -+ }; -+ partition@qspi-rootfs { -+ label = "qspi-rootfs"; -+ reg = <0x620000 0x5E0000>; -+ }; -+ partition@qspi-bitstream { -+ label = "qspi-bitstream"; -+ reg = <0xC00000 0x400000>; -+ }; -+ }; -+}; -+ -+&sdhci0 { -+ u-boot,dm-pre-reloc; -+ status = "okay"; -+}; -+ -+&uart1 { -+ u-boot,dm-pre-reloc; -+ status = "okay"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_uart1_default>; -+}; --- -2.23.0 - diff --git a/board/qmtech/zynq/readme.txt b/board/qmtech/zynq/readme.txt deleted file mode 100644 index 5fb95bb90b..0000000000 --- a/board/qmtech/zynq/readme.txt +++ /dev/null @@ -1,76 +0,0 @@ -******************************* -QMTECH Zynq XC7Z010 Starter Kit -******************************* - -This file documents the Buildroot support for the QMTECH [1] Zynq -XC7Z010 Starter Kit [2]. It is a low cost (~55$) Zynq based -development board. The board user manual is available at -[3]. Additional files are available on Github [4]. - - -Build -===== - -First, configure Buildroot for the QMTECH Zynq board: - - make zynq_qmtech_defconfig - -Build all components: - - make - -You will find in output/images/ the following files: - - boot.bin - - boot.vfat - - devicetree.dtb - - rootfs.cpio - - rootfs.cpio.gz - - rootfs.cpio.uboot - - rootfs.tar - - sdcard.img - - u-boot.bin - - u-boot.img - - uImage - - zynq-qmtech.dtb - - -Create a bootable micro SD card -=============================== - -To determine the device associated to the micro SD card have a look in -the /proc/partitions file: - - cat /proc/partitions - -Buildroot prepares a bootable "sdcard.img" image in the output/images/ -directory, ready to be dumped on a micro SD card. Launch the following -command as root: - - dd if=output/images/sdcard.img of=/dev/ - -*** WARNING! This will destroy all the card content. Use with care! *** - - -Boot the QMTECH Zynq board -========================== - -To boot your newly created system: -- put a mini USB cable into the J4 Debug USB Port and connect using a - terminal emulator at 115200 bps, 8n1, -- put the prepared micro SD card in the J2 micro SD card slot, -- plug the 5V power supply on the JP4 barrel jack. - -Enjoy! - - -[1]. QMTECH: - http://www.chinaqmtech.com/ - -[2]. QMTECH Zynq XC7Z010 Starter Kit Product Page: - http://www.chinaqmtech.com/xilinx_zynq_soc - -[3]. QMTECH Zynq XC7Z010 Starter Kit Hardware User Manual: - http://www.chinaqmtech.com/filedownload/32552 - -[4]. QMTECH Github: - https://github.com/ChinaQMTECH/ZYNQ_STARTER_KIT diff --git a/configs/zynq_qmtech_defconfig b/configs/zynq_qmtech_defconfig deleted file mode 100644 index f536b80f57..0000000000 --- a/configs/zynq_qmtech_defconfig +++ /dev/null @@ -1,33 +0,0 @@ -BR2_arm=y -BR2_cortex_a9=y -BR2_ARM_ENABLE_NEON=y -BR2_ARM_ENABLE_VFP=y -BR2_GLOBAL_PATCH_DIR="board/qmtech/zynq/patches" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xilinx-v2019.2.01)/linux-xilinx-v2019.2.01.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" -BR2_LINUX_KERNEL_UIMAGE=y -BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="zynq-qmtech" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,jolivain,u-boot-xlnx,xilinx-v2019.2.qmtech.1)/uboot-xilinx-v2019.2.qmtech.1.tar.gz" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="zynq_qmtech" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_FORMAT_IMG=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y From 8e871ac18bcedb268d11059a8e5be40da442295f Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 21 Nov 2023 19:03:39 +0100 Subject: [PATCH 92/93] package/rdma-core: bump to version v49.0 For change log, see: https://github.com/linux-rdma/rdma-core/releases/tag/v49.0 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/rdma-core/rdma-core.hash | 2 +- package/rdma-core/rdma-core.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rdma-core/rdma-core.hash b/package/rdma-core/rdma-core.hash index f0f2448a8f..fc1d319123 100644 --- a/package/rdma-core/rdma-core.hash +++ b/package/rdma-core/rdma-core.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 e78abaa3ed16771bc6c40b538fe27082429363b86b6ce47636bb57a59238b2be rdma-core-48.0.tar.gz +sha256 1ea2c2678d48be0b179871e9ae8c58ceab11a0c5b69315a332ff51dd607180b7 rdma-core-49.0.tar.gz sha256 99e0df1d009a21d0dfb031600c550fd8f4efc0c6b2a4ef8b34a995aa6f79c9f4 COPYING.BSD_MIT sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL2 sha256 c46a557f25b8ef9bec76526c4e593fc13e6cba27e7ba30d73b6497a689cf06f6 COPYING.md diff --git a/package/rdma-core/rdma-core.mk b/package/rdma-core/rdma-core.mk index 41f10d44f6..5f8989b3bd 100644 --- a/package/rdma-core/rdma-core.mk +++ b/package/rdma-core/rdma-core.mk @@ -4,7 +4,7 @@ # ################################################################################ -RDMA_CORE_VERSION = 48.0 +RDMA_CORE_VERSION = 49.0 RDMA_CORE_SITE = $(call github,linux-rdma,rdma-core,v$(RDMA_CORE_VERSION)) RDMA_CORE_LICENSE = GPL-2.0 or BSD-2-Clause RDMA_CORE_LICENSE_FILES = COPYING.GPL2 COPYING.BSD_MIT COPYING.md From 3503d48897bd841f26e2a20bf750dc8174d0fa85 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 11 Nov 2023 12:37:31 +0100 Subject: [PATCH 93/93] support/misc/gitlab-ci.yml.in: print error log if the runtime test fail When an error occurs, the gitlab-ci job log doesn't contain any useful information than the name of the failing test: FAIL: test_run (tests.package.test_python_paho_mqtt.TestPythonPahoMQTT) In order to encourage contributors to investigate issues reported by gitlab-ci, we want to print the last lines of the log file (build or runtime). Unfortunately, gitlab-ci job log completely strips lines ending with CRCRLF [1][2]. We have to take a look at the gitlab-ci raw log to see the complete log [3]. To workaround this issue, remove crlf from qemu serial stdio log while printing in the gitlab-ci job log (we don't want to change the log file generated by support/testing/run-tests and saved as artefacts). [1] https://gitlab.com/gitlab-org/gitlab/-/issues/218771 [2] https://gitlab.com/kubu93/buildroot/-/jobs/5492937691 [3] https://gitlab.com/kubu93/buildroot/-/jobs/5492937691/raw Cc: Peter Korsgaard Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- support/misc/gitlab-ci.yml.in | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in index 4d9acbc3d3..db206432aa 100644 --- a/support/misc/gitlab-ci.yml.in +++ b/support/misc/gitlab-ci.yml.in @@ -103,7 +103,16 @@ before_script: script: - TEST_CASE_NAME=${CI_JOB_NAME} - echo "Starting runtime test ${TEST_CASE_NAME}" - - ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${TEST_CASE_NAME} + - | + ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${TEST_CASE_NAME} || { + echo 'Failed runtime test last output' + if [ -f test-output/*-run.log ]; then + tail -200 test-output/*-run.log | sed 's/\r\r$//' + else + tail -200 test-output/*-build.log + fi + exit 1 + } retry: max: 2 when: