thin-provisioning-tools: Fix build on riscv32
PATCH 1/2 thin-provisioning-tools: Fix build on riscv32
Rustix crate needs to be patched
Signed-off-by Khem Raj <[email protected]>
--- .../0001-Fix-cargo-build-on-riscv32.patch | 75 +++++++++++++++++++ .../thin-provisioning-tools_1.1.0.bb | 1 + 2 files changed, 76 insertions(+) create mode 100644 meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools/0001-Fix-cargo-build-on-riscv32.patch
meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools/0001-Fix-cargo-build-on-riscv32.patch new file +75 -0
@@ -0,0 +1,75 @@ +From b85c7b406f017589eb959cd619ba442837ada470 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 4 Apr 2025 00:29:22 -0700 +Subject: [PATCH] Fix cargo build on riscv32 + +riscv32 support is added to latest rustix already +therefore this patch is limited to rustix-0.38.19 +once cargo/rust moves beyond rustix-0.38.19 as dependency +we can remove this patch + +Upstream-Status: Inappropriate [Specific to rustix-0.38.19] + +Signed-off-by: Khem Raj <[email protected]> +--- + src/fs/ioctl.rs | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +--- a/src/fs/ioctl.rs ++++ b/src/fs/ioctl.rs +@@ -11,6 +11,14 @@ use { + + use bitflags::bitflags; + ++/// The datatype used for the ioctl number ++#[cfg(any(target_os = "android", target_env = "musl"))] ++#[doc(hidden)] ++pub type ioctl_num_type = c::c_int; ++#[cfg(not(any(target_os = "android", target_env = "musl")))] ++#[doc(hidden)] ++pub type ioctl_num_type = c::c_ulong; ++ + #[cfg(all(linux_kernel, not(any(target_arch = "sparc", target_arch = "sparc64"))))] + use crate::fd::{AsRawFd, BorrowedFd}; + +@@ -79,7 +87,8 @@ unsafe impl ioctl::Ioctl for Ficlone<'_> + type Output = (); + + const IS_MUTATING: bool = false; +- const OPCODE: ioctl::Opcode = ioctl::Opcode::old(c::FICLONE as ioctl::RawOpcode); ++ const OPCODE: ioctl::Opcode = ++ ioctl::Opcode::old(linux_raw_sys::ioctl::FICLONE as ioctl::RawOpcode); + + fn as_ptr(&mut self) -> *mut c::c_void { + self.0.as_raw_fd() as *mut c::c_void +@@ -136,7 +145,12 @@ bitflags! { + #[doc(alias = "FS_IOC_GETFLAGS")] + pub fn ioctl_getflags<Fd: AsFd>(fd: Fd) -> io::Result<IFlags> { + unsafe { +- #[cfg(target_pointer_width = "32")] ++ #[cfg(target_arch = "riscv32")] ++ let ctl = ioctl::Getter::< ++ ioctl::BadOpcode<{ linux_raw_sys::ioctl::FS_IOC32_GETFLAGS as ioctl_num_type }>, ++ u32, ++ >::new(); ++ #[cfg(all(target_pointer_width = "32", not(target_arch = "riscv32")))] + let ctl = ioctl::Getter::<ioctl::BadOpcode<{ c::FS_IOC32_GETFLAGS }>, u32>::new(); + #[cfg(target_pointer_width = "64")] + let ctl = ioctl::Getter::<ioctl::BadOpcode<{ c::FS_IOC_GETFLAGS }>, u32>::new(); +@@ -152,8 +166,15 @@ pub fn ioctl_getflags<Fd: AsFd>(fd: Fd) + #[inline] + #[doc(alias = "FS_IOC_SETFLAGS")] + pub fn ioctl_setflags<Fd: AsFd>(fd: Fd, flags: IFlags) -> io::Result<()> { ++ use crate::ioctl::Ioctl; ++ + unsafe { +- #[cfg(target_pointer_width = "32")] ++ #[cfg(target_arch = "riscv32")] ++ let ctl = ioctl::Setter::< ++ ioctl::BadOpcode<{ linux_raw_sys::ioctl::FS_IOC32_SETFLAGS as ioctl_num_type }>, ++ u32, ++ >::new(flags.bits()); ++ #[cfg(all(target_pointer_width = "32", not(target_arch = "riscv32")))] + let ctl = + ioctl::Setter::<ioctl::BadOpcode<{ c::FS_IOC32_SETFLAGS }>, u32>::new(flags.bits()); +
meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.1.0.bb +1 -0
@@ -9,6 +9,7 @@ S = "${WORKDIR}/git" SRC_URI = " \ git://github.com/jthornber/thin-provisioning-tools;branch=main;protocol=https \ + file://0001-Fix-cargo-build-on-riscv32.patch;patchdir=${CARGO_VENDORING_DIRECTORY}/rustix-0.38.34 \ " # v1.1.0
PATCH 2/2 thin-provisioning-tools-crates: Fix build on 32-bit hosts without 64bit atomics
Use portable-atomic crate for 64bit atomics, helps 32bit arches without 64bit atomic intrinsics.
Signed-off-by Khem Raj <[email protected]>
--- .../thin-provisioning-tools-crates.inc | 4 +- .../0001-Use-portable-atomics-crate.patch | 86 +++++++++++++++++++ .../thin-provisioning-tools_1.1.0.bb | 1 + 3 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools/0001-Use-portable-atomics-crate.patch
meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc +2 -2
@@ -78,7 +78,7 @@ SRC_URI += " \ crate://crates.io/once_cell/1.19.0 \ crate://crates.io/os_pipe/1.2.1 \ crate://crates.io/pkg-config/0.3.30 \ - crate://crates.io/portable-atomic/1.7.0 \ + crate://crates.io/portable-atomic/1.11.0 \ crate://crates.io/ppv-lite86/0.2.20 \ crate://crates.io/predicates/3.1.2 \ crate://crates.io/predicates-core/1.0.8 \
@@ -218,7 +218,7 @@ SRC_URI[numtoa-0.1.0.sha256sum] = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26 SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" SRC_URI[os_pipe-1.2.1.sha256sum] = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982" SRC_URI[pkg-config-0.3.30.sha256sum] = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" -SRC_URI[portable-atomic-1.7.0.sha256sum] = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +SRC_URI[portable-atomic-1.11.0.sha256sum] = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" SRC_URI[ppv-lite86-0.2.20.sha256sum] = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" SRC_URI[predicates-3.1.2.sha256sum] = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" SRC_URI[predicates-core-1.0.8.sha256sum] = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931"
meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools/0001-Use-portable-atomics-crate.patch new file +86 -0
86 lines not on this page · raw message
meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.1.0.bb +1 -0
@@ -10,6 +10,7 @@ S = "${WORKDIR}/git" SRC_URI = " \ git://github.com/jthornber/thin-provisioning-tools;branch=main;protocol=https \ file://0001-Fix-cargo-build-on-riscv32.patch;patchdir=${CARGO_VENDORING_DIRECTORY}/rustix-0.38.34 \ + file://0001-Use-portable-atomics-crate.patch \ " # v1.1.0