From 4fe6bf337a732e3efd2c14472a8991f0d4eefec7 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 13 May 2026 10:43:51 +0800 Subject: [PATCH] thin-provisioning-tools: fix compile failure on 32bit BSPs $ echo 'MACHINE = "qemux86"' >> conf/local.conf $ bitbake thin-provisioning-tools ``` error[E0080]: index out of bounds: the length is 1 but the index is 4 --> tmp/work/core2-32-wrs-linux/thin-provisioning-tools/1.3.1/build/target/release/build/devicemapper-sys-f88f57f28cd965d2/out/dm-bindings.rs:3:8718 | 3 | ...usize] ; ["Alignment of dm_ioctl"] [:: std :: mem :: align_of :: < dm_ioctl > () - 4usize] ; ["Offset of field: dm_ioctl::version"... | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ evaluation of `_` failed here ``` Inherit siteinfo to use SITEINFO_BITS replace TUNE_FEATURES to test 32bit BSPs Signed-off-by: Hongxu Jia Signed-off-by: Khem Raj --- .../thin-provisioning-tools/thin-provisioning-tools_1.3.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.3.1.bb b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.3.1.bb index 4d8d2a04df..bdfadc04e8 100644 --- a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.3.1.bb +++ b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.3.1.bb @@ -10,7 +10,7 @@ SRC_URI = " \ git://github.com/device-mapper-utils/thin-provisioning-tools;branch=main;protocol=https;tag=v${PV} \ file://0001-Use-portable-atomics-crate.patch \ file://disable-cargo-metadata.patch \ - ${@bb.utils.contains('TUNE_FEATURES', '32', \ + ${@bb.utils.contains('SITEINFO_BITS', '32', \ 'file://dms-no-layout-check.patch;patchdir=${CARGO_VENDORING_DIRECTORY}/devicemapper-sys-0.3.3', \ '', d)} \ " @@ -19,7 +19,7 @@ SRCREV = "8b663fb4c6fb8e52ca06cea57b986c5ba45f668d" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" inherit cargo cargo-update-recipe-crates -inherit pkgconfig +inherit pkgconfig siteinfo DEPENDS += "udev libdevmapper libdevmapper-native clang-native"