From dd673499e1def085fa1cdcf9c0ed092a40e8cb24 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 2 Oct 2026 19:48:21 -0600 Subject: [PATCH] package/python-cbor2: bump to version 6.1.5 Switch to the setuptools-rust build backend and vendor the Rust dependencies. The pure Python implementation is no longer available. Propagate the Rust architecture dependency to python-zlmdb. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-cbor2/Config.in | 3 ++- package/python-cbor2/python-cbor2.hash | 5 ++--- package/python-cbor2/python-cbor2.mk | 12 ++++++------ package/python-zlmdb/Config.in | 2 ++ 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/package/python-cbor2/Config.in b/package/python-cbor2/Config.in index ba9383f787..c0a114e1f2 100644 --- a/package/python-cbor2/Config.in +++ b/package/python-cbor2/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_CBOR2 bool "python-cbor2" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS help - Pure Python CBOR (de)serializer with extensive tag support. + CBOR (de)serializer with extensive tag support. https://cbor2.readthedocs.io/ diff --git a/package/python-cbor2/python-cbor2.hash b/package/python-cbor2/python-cbor2.hash index b4d3025889..4ec5434b49 100644 --- a/package/python-cbor2/python-cbor2.hash +++ b/package/python-cbor2/python-cbor2.hash @@ -1,5 +1,4 @@ -# md5, sha256 from https://pypi.org/pypi/cbor2/json -md5 21a7e1096c25ef19a81730e2c0ce05a6 cbor2-5.9.0.tar.gz -sha256 85c7a46279ac8f226e1059275221e6b3d0e370d2bb6bd0500f9780781615bcea cbor2-5.9.0.tar.gz +# Locally calculated after vendoring +sha256 c0be697accd3e106feb9a082f52b6c6e2b83428148ab78ce6732a76c380233f8 python-cbor2-6.1.5-cargo6.tar.gz # Locally computed sha256 checksums sha256 a6afd126d8f545a15166a22f25fadff4b9fb4978bbdd17e97d97d950b66d2fef LICENSE.txt diff --git a/package/python-cbor2/python-cbor2.mk b/package/python-cbor2/python-cbor2.mk index bb8944f861..b35fba187a 100644 --- a/package/python-cbor2/python-cbor2.mk +++ b/package/python-cbor2/python-cbor2.mk @@ -4,18 +4,18 @@ # ################################################################################ -PYTHON_CBOR2_VERSION = 5.9.0 -PYTHON_CBOR2_SOURCE = cbor2-$(PYTHON_CBOR2_VERSION).tar.gz -PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/bd/cb/09939728be094d155b5d4ac262e39877875f5f7e36eea66beb359f647bd0 -PYTHON_CBOR2_SETUP_TYPE = setuptools +PYTHON_CBOR2_VERSION = 6.1.5 +PYTHON_CBOR2_SOURCE_PYPI = cbor2-$(PYTHON_CBOR2_VERSION).tar.gz +PYTHON_CBOR2_SITE_PYPI = https://files.pythonhosted.org/packages/39/34/d443914ea562a985ccb357682e17b7190d5d58eff797c741379be47a8f31 +PYTHON_CBOR2_SITE = $(PYTHON_CBOR2_SITE_PYPI)/$(PYTHON_CBOR2_SOURCE_PYPI)?buildroot-path=filename +PYTHON_CBOR2_SETUP_TYPE = setuptools-rust +PYTHON_CBOR2_CARGO_MANIFEST_PATH = rust/Cargo.toml PYTHON_CBOR2_LICENSE = MIT PYTHON_CBOR2_LICENSE_FILES = LICENSE.txt PYTHON_CBOR2_CPE_ID_VENDOR = agronholm PYTHON_CBOR2_CPE_ID_PRODUCT = cbor2 PYTHON_CBOR2_DEPENDENCIES = host-python-setuptools-scm -PYTHON_CBOR2_ENV = CBOR2_BUILD_C_EXTENSION=1 HOST_PYTHON_CBOR2_DEPENDENCIES = host-python-setuptools-scm -HOST_PYTHON_CBOR2_ENV = CBOR2_BUILD_C_EXTENSION=0 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-zlmdb/Config.in b/package/python-zlmdb/Config.in index 007ca72723..884cfff182 100644 --- a/package/python-zlmdb/Config.in +++ b/package/python-zlmdb/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_ZLMDB bool "python-zlmdb" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cbor2 depends on BR2_INSTALL_LIBSTDCPP # python-numpy depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy @@ -20,6 +21,7 @@ config BR2_PACKAGE_PYTHON_ZLMDB https://github.com/crossbario/zlmdb comment "python-zlmdb needs a glibc or musl toolchain w/ C++, gcc >= 9" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \