revert: "fix: worker binary release targets and cross-compilation deps (#1428)" (#1433)

Author: ytallo

.github/workflows/_rust-binary.yml

@@ -84,8 +84,6 @@ env:
   CARGO_TERM_COLOR: always
   CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
   CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-gcc
-  CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_PKG_CONFIG_ALLOW_CROSS: '1'
-  PKG_CONFIG_SYSROOT_DIR_aarch64_unknown_linux_gnu: /usr/aarch64-linux-gnu
 
 jobs:
   prepare-matrix:
@@ -206,25 +204,9 @@ jobs:
 
       - name: Install additional system dependencies
         if: runner.os == 'Linux' && inputs.system_deps != ''
-        env:
-          BUILD_TARGET: ${{ matrix.target }}
         run: |
           sudo apt-get update
-          case "$BUILD_TARGET" in
-            aarch64-unknown-linux-gnu)
-              sudo dpkg --add-architecture arm64
-              sudo sed -i 's/^deb /deb [arch=amd64] /' /etc/apt/sources.list
-              echo "deb [arch=arm64] http://ports.ubuntu.com/ $(lsb_release -cs) main restricted universe" | sudo tee /etc/apt/sources.list.d/arm64.list
-              echo "deb [arch=arm64] http://ports.ubuntu.com/ $(lsb_release -cs)-updates main restricted universe" | sudo tee -a /etc/apt/sources.list.d/arm64.list
-              sudo apt-get update
-              for pkg in ${{ inputs.system_deps }}; do
-                sudo apt-get install -y "${pkg}:arm64"
-              done
-              ;;
-            *)
-              sudo apt-get install -y ${{ inputs.system_deps }}
-              ;;
-          esac
+          sudo apt-get install -y ${{ inputs.system_deps }}
 
       - name: Install cross-compilation tools
         if: runner.os == 'Linux'

Cargo.lock

@@ -21,6 +21,7 @@ embed-init = ["iii-filesystem/embed-init"]
 [dependencies]
 iii-filesystem = { path = "../iii-filesystem" }
 iii-network = { path = "../iii-network" }
+msb_krun = { version = "0.1.9", features = ["net"] }
 oci-client = "0.16"
 oci-spec = "0.9"
 tokio = { version = "1", features = ["process", "macros", "rt-multi-thread", "fs", "signal", "time", "io-std"] }
@@ -44,9 +45,6 @@ tracing-subscriber = { version = "0.3", features = ["fmt", "env-filter"] }
 futures = "0.3"
 indicatif = "0.17"
 
-[target.'cfg(all(target_os = "linux", not(target_env = "musl")))'.dependencies]
-msb_krun = { version = "0.1.9", features = ["net"] }
-
 [dev-dependencies]
 tokio = { version = "1", features = ["test-util"] }
 tempfile = "3"

crates/iii-worker/Cargo.toml

@@ -136,7 +136,6 @@ pub enum Commands {
     },
 
     /// Internal: boot a libkrun VM (crash-isolated subprocess)
-    #[cfg(all(target_os = "linux", not(target_env = "musl")))]
     #[command(name = "__vm-boot", hide = true)]
     VmBoot(super::vm_boot::VmBootArgs),
 }