silabs-multiprotocol: Use native zigbeed on amd64 (home-assistant#3040)

* Use native x86-64/amd64 support and remove amd64 specific Dockerfile The latest Gecko SDK supports x86-64 natively and in production quality. Let's use the native zigbeed support instead of our QEMU emulated aarch64 workaround. * Avoid disabling otbr-web service twice When the otbr-agent is already disabled, the script tries to disable otbr-web twice which is confusing. * Update CHANGELOG.md/config.yaml * Add missing debian-amd64.cmake * Fix aarch64 build * Apply suggestions from code review Co-authored-by: Pascal Vizeli <[email protected]>
henrikhierl · May 15, 2023 · a34b551 · a34b551
1 parent ae2107b
commit a34b551
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 291 deletions.
diff --git a/silabs-multiprotocol/CHANGELOG.md b/silabs-multiprotocol/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.1.3
+
+- Use native zigbeed on x86-64/amd64 architecture
+- Avoid deleting otbr-web user content twice
+
 ## 1.1.2
 
 - Use Silicon Labs Gecko SDK 4.2.3

diff --git a/silabs-multiprotocol/Dockerfile b/silabs-multiprotocol/Dockerfile
@@ -51,6 +51,21 @@ RUN \
     && apt-get install -y --no-install-recommends \
        crossbuild-essential-arm64
 
+FROM --platform=linux/amd64 cross-builder-base AS cross-builder-amd64
+
+COPY debian-amd64.cmake /usr/src/debian.cmake
+
+ENV DEBIAN_ARCH=amd64 \
+        DEBIAN_CROSS_PREFIX=x86_64-linux-gnu \
+        SLC_ARCH=zigbee_x86_64
+
+RUN \
+    set -x \
+    && dpkg --add-architecture amd64 \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends \
+       crossbuild-essential-amd64
+
 
 FROM --platform=linux/amd64 cross-builder-${BUILD_ARCH} AS cpcd-builder
 

diff --git a/silabs-multiprotocol/Dockerfile.amd64 b/silabs-multiprotocol/Dockerfile.amd64
diff --git a/silabs-multiprotocol/config.yaml b/silabs-multiprotocol/config.yaml
@@ -1,5 +1,5 @@
 ---
-version: 1.1.2
+version: 1.1.3
 slug: silabs_multiprotocol
 name: Silicon Labs Multiprotocol
 description: Zigbee and OpenThread multiprotocol add-on

diff --git a/silabs-multiprotocol/debian-amd64.cmake b/silabs-multiprotocol/debian-amd64.cmake
@@ -0,0 +1,14 @@
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_PROCESSOR x86_64)
+SET(CMAKE_SYSTEM_VERSION 1)
+
+# Specify the cross compiler
+SET(CMAKE_C_COMPILER /usr/bin/x86_64-linux-gnu-gcc)
+SET(CMAKE_CXX_COMPILER /usr/bin/x86_64-linux-gnu-g++)
+
+# Search for programs only in the build host directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+
+# Search for libraries and headers only in the target directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
diff --git a/silabs-multiprotocol/execvp-aarch64.patch b/silabs-multiprotocol/execvp-aarch64.patch
diff --git a/silabs-multiprotocol/rootfs.amd64/usr/local/bin/zigbeed b/silabs-multiprotocol/rootfs.amd64/usr/local/bin/zigbeed
diff --git a/silabs-multiprotocol/rootfs/etc/s6-overlay/scripts/otbr-enable-check.sh b/silabs-multiprotocol/rootfs/etc/s6-overlay/scripts/otbr-enable-check.sh
@@ -9,6 +9,7 @@ if bashio::config.false 'otbr_enable'; then
     rm /etc/s6-overlay/s6-rc.d/user/contents.d/otbr-agent-rest-discovery
     rm /etc/s6-overlay/s6-rc.d/user/contents.d/mdns
     bashio::log.info "The otbr-agent is disabled."
+    bashio::exit.ok
 fi
 
 if bashio::var.has_value "$(bashio::addon.port 8080)" \