Merge pull request #3182 from reubenmiller/fix-armv6-builds

fix: target incompatibility with armv6 package for raspberry pi
thin-edge · Oct 10, 2024 · c5dcb29 · c5dcb29
2 parents 01c26b8 + 3cd8d53
commit c5dcb29
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build-workflow.yml b/.github/workflows/build-workflow.yml
@@ -272,8 +272,8 @@ jobs:
         job:
           - { target: x86_64-unknown-linux-musl,      repo: tedge-main,          component: main }
           - { target: aarch64-unknown-linux-musl,     repo: tedge-main,          component: main }
-          # Keep arm-unknown-linux-musleabihf in separate repo due to armhf conflict between raspbian and debian
-          - { target: arm-unknown-linux-musleabihf,   repo: tedge-main-armv6,    component: main }
+          # Keep arm-unknown-linux-musleabi in separate repo due to armhf conflict between raspbian and debian
+          - { target: arm-unknown-linux-musleabi,   repo: tedge-main-armv6,    component: main }
           - { target: armv7-unknown-linux-musleabihf, repo: tedge-main,          component: main }
           - { target: arm-unknown-linux-musleabi,     repo: tedge-main,          component: main }
           - { target: i686-unknown-linux-musl,        repo: tedge-main,          component: main }

diff --git a/ci/build_scripts/build.sh b/ci/build_scripts/build.sh
@@ -151,7 +151,7 @@ if [ -z "$ARCH" ]; then
             ;;
 
         armv6*)
-            ARCH=arm-unknown-linux-musleabihf
+            ARCH=arm-unknown-linux-musleabi
             ;;
     esac
 fi

diff --git a/ci/build_scripts/detect_target.sh b/ci/build_scripts/detect_target.sh
@@ -18,7 +18,7 @@ detect_linux_target() {
             ;;
 
         armv6*)
-            target_arch=arm-unknown-linux-musleabihf
+            target_arch=arm-unknown-linux-musleabi
             ;;
     esac
     echo "$target_arch"

diff --git a/ci/build_scripts/package.sh b/ci/build_scripts/package.sh
@@ -215,7 +215,7 @@ get_package_arch() {
         aarch64-unknown-linux-*) pkg_arch=arm64 ;;
         armv7-unknown-linux-*eabihf) pkg_arch=arm7 ;;
         arm-unknown-linux-*eabihf) pkg_arch=arm6 ;;
-        arm-unknown-linux-*eabi) pkg_arch=arm5 ;;
+        arm-unknown-linux-*eabi) pkg_arch=arm6 ;;
         armv5te-unknown-linux-*eabi) pkg_arch=arm5 ;;
         riscv64gc-unknown-linux-*) pkg_arch=riscv64 ;;
         mips64el-unknown-linux-*abi64) pkg_arch=mips64le ;;

diff --git a/ci/build_scripts/publish_packages.sh b/ci/build_scripts/publish_packages.sh
@@ -184,7 +184,7 @@ get_user_friendly_arch() {
             easy_arch=armv6
             ;;
         *arm-unknown-linux-musleabi*)
-            easy_arch=armv5
+            easy_arch=armv6
             ;;
         *armv5te-unknown-linux-*)
             easy_arch=armv5

diff --git a/containers/tedge/Dockerfile b/containers/tedge/Dockerfile
@@ -8,7 +8,7 @@ RUN case "${TARGETPLATFORM}" in \
          "linux/amd64")  RUST_TARGET=x86_64-unknown-linux-musl  ;; \
          "linux/arm64")  RUST_TARGET=aarch64-unknown-linux-musl ;; \
          "linux/arm/v7") RUST_TARGET=armv7-unknown-linux-musleabihf  ;; \
-         "linux/arm/v6") RUST_TARGET=arm-unknown-linux-musleabihf  ;; \
+         "linux/arm/v6") RUST_TARGET=arm-unknown-linux-musleabi  ;; \
          *) echo "Unsupported target platform: TARGETPLATFORM=$TARGETPLATFORM"; exit 1 ;; \
     esac \
     && mkdir -p /build \