ci: build armv7 without io-uring bindgen

Signed-off-by: Sam Day <me@samcday.com>

Author: samcday

.cargo/config.toml

@@ -3,7 +3,7 @@ rustflags = ["--cfg=web_sys_unstable_apis"]
 
 [alias]
 gadget-musl-aarch64 = ["build", "-p", "smoo-gadget-cli", "--release", "--target", "aarch64-unknown-linux-musl"]
-gadget-musl-armv7 = ["build", "-p", "smoo-gadget-cli", "--release", "--target", "armv7-unknown-linux-musleabihf", "--features", "smoo-gadget-cli/apkbuild"]
+gadget-musl-armv7 = ["build", "-p", "smoo-gadget-cli", "--release", "--target", "armv7-unknown-linux-musleabihf"]
 gadget-musl-x86_64 = ["build", "-p", "smoo-gadget-cli", "--release", "--target", "x86_64-unknown-linux-musl"]
 xtask = ["run", "--quiet", "--package", "xtask", "--"]
 
@@ -13,7 +13,7 @@ rustflags = ["-C", "target-feature=+crt-static"]
 
 [target.armv7-unknown-linux-musleabihf]
 linker = "rust-lld"
-rustflags = ["-C", "target-feature=+crt-static"]
+rustflags = ["-C", "target-feature=+crt-static", "--cfg=io_uring_skip_arch_check"]
 
 [target.x86_64-unknown-linux-musl]
 linker = "rust-lld"

.github/workflows/build.yml

@@ -54,16 +54,25 @@ jobs:
             runner: ubuntu-24.04
             target: x86_64-unknown-linux-musl
             build_args: "--bins"
+            extra_packages: ""
+            rustflags: ""
+            bindgen_extra_clang_args: ""
             upload_host: true
           - name: aarch64
             runner: ubuntu-24.04-arm
             target: aarch64-unknown-linux-musl
             build_args: "--bins"
+            extra_packages: ""
+            rustflags: ""
+            bindgen_extra_clang_args: ""
             upload_host: true
           - name: armv7
             runner: ubuntu-24.04
             target: armv7-unknown-linux-musleabihf
-            build_args: "-p smoo-gadget-cli --features smoo-gadget-cli/apkbuild"
+            build_args: "-p smoo-gadget-cli"
+            extra_packages: "libc6-dev-armhf-cross"
+            rustflags: "--cfg=io_uring_skip_arch_check"
+            bindgen_extra_clang_args: "--sysroot=/usr/arm-linux-gnueabihf"
             upload_host: false
 
     steps:
@@ -77,7 +86,7 @@ jobs:
       - name: Install musl toolchain
         run: |
           sudo apt-get update
-          sudo apt-get install -y musl-tools linux-libc-dev
+          sudo apt-get install -y musl-tools linux-libc-dev ${{ matrix.extra_packages }}
 
       - name: Set up musl kernel headers
         run: |
@@ -89,9 +98,15 @@ jobs:
             sudo ln -sf /usr/include/$(uname -m)-linux-gnu/asm /usr/include/$(uname -m)-linux-musl/asm
           elif [ -d /usr/include/asm ]; then
             sudo ln -sf /usr/include/asm /usr/include/$(uname -m)-linux-musl/asm
+          else
+            sudo ln -sf /usr/include/asm-generic /usr/include/$(uname -m)-linux-musl/asm
+            sudo ln -sf /usr/include/asm-generic /usr/include/asm
           fi
 
       - name: Build (static musl)
+        env:
+          RUSTFLAGS: "-D warnings ${{ matrix.rustflags }}"
+          BINDGEN_EXTRA_CLANG_ARGS: ${{ matrix.bindgen_extra_clang_args }}
         run: |
           cargo build \
             ${{ matrix.build_args }} \

crates/smoo-gadget-ublk/build.rs

@@ -18,14 +18,12 @@ fn add_serialize(outdir: &std::path::Path) -> anyhow::Result<i32> {
         regex::Regex::new(r"#\s*\[\s*derive\s*\((?P<d>[^)]+)\)\s*\]\s*pub\s*(?P<s>struct|enum)")?
             .replace_all(&res, "#[derive($d, Serialize, Deserialize)] pub $s")
     )
-    .replace(
-        "#[derive(Copy, Clone, Serialize, Deserialize)] pub struct ublksrv_io_desc",
-        "#[derive(Copy, Clone)] pub struct ublksrv_io_desc",
-    )
-    .replace(
-        "#[derive(Copy, Clone, Serialize, Deserialize)] pub struct ublksrv_io_cmd",
-        "#[derive(Copy, Clone)] pub struct ublksrv_io_cmd",
-    );
+    .to_string();
+    let data = regex::Regex::new(
+        r"#\s*\[\s*derive\s*\(\s*Copy\s*,\s*Clone\s*,\s*Serialize\s*,\s*Deserialize\s*\)\s*\]\s*pub\s+struct\s+(?P<name>ublksrv_io_desc|ublksrv_io_cmd)",
+    )?
+    .replace_all(&data, "#[derive(Copy, Clone)] pub struct $name")
+    .to_string();
     let mut fd = File::create(outdir.join("ublk_cmd.rs"))?;
     fd.write_all(data.as_bytes())?;