Merge pull request #4 from Se7ven/v1.0.3

## 1.0.3

Author: Se7ven

.github/workflows/build.yaml

@@ -10,14 +10,14 @@ on:
 
 jobs:
   variables:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04-arm
     outputs:
       ARCH_LIST: ${{ env.ARCH_LIST }}
       ADDON_LIST: ${{ env.ADDON_LIST }}
       DOCKER_ARGS: ${{ env.DOCKER_ARGS }}
     env:
-      CPCD_VERSION: v4.5.2
-      GECKO_SDK_VERSION: v2024.6.1-0
+      CPCD_VERSION: v4.7.0
+      GECKO_SDK_VERSION: v2025.6.0
       UNIVERSAL_SILABS_FLASHER: 0.0.22
     steps:
       - uses: actions/checkout@v3
@@ -37,7 +37,7 @@ jobs:
 
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: buildjet-8vcpu-ubuntu-2204
     permissions:
       contents: read
       packages: write
@@ -48,11 +48,11 @@ jobs:
       matrix:
         arch:
           - arch: aarch64
-            from: ghcr.io/home-assistant/aarch64-base-debian:bullseye
+            from: ghcr.io/home-assistant/aarch64-base-debian:bookworm
           - arch: armv7
-            from: ghcr.io/home-assistant/armv7-base-debian:bullseye
+            from: ghcr.io/home-assistant/armv7-base-debian:bookworm
           - arch: amd64
-            from: ghcr.io/home-assistant/amd64-base-debian:bullseye
+            from: ghcr.io/home-assistant/amd64-base-debian:bookworm
     steps:
       - uses: actions/checkout@v3
       - name: set version
@@ -74,10 +74,15 @@ jobs:
         with:
           username: ${{ vars.DOCKER_LOGIN }}
           password: ${{ secrets.DOCKER_PASSWORD }}
+#      - uses: docker/setup-qemu-action@v3
+#        with:
+#          platforms: linux/arm64,linux/amd64,linux/armv7
+#          image: tonistiigi/binfmt:latest
       - name: Build
         run: |
           docker run --rm --privileged \
               -v /home/runner/.docker:/root/.docker \
+              --ulimit memlock=100000000000:100000000000 \
               -v /run/docker.sock:/run/docker.sock:rw \
               -v $(pwd)/silabs-multiprotocol-ember:/data homeassistant/amd64-builder --${{ matrix.arch.arch }} -t /data \
               ${{ env.DOCKER_ARGS }}

silabs-multiprotocol-ember/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 1.0.3
+
+Updates:
+- simplicity sdk -> v2025.6.0
+- cpcd -> v4.7.0
+
+Changes:
+- Build image changed from Debian to Ubuntu
+
 ## 1.0.2
 - Fix SimplicitySDK version
 

silabs-multiprotocol-ember/Dockerfile

@@ -1,6 +1,6 @@
 ARG BUILD_FROM
 ARG BUILD_ARCH
-FROM --platform=linux/amd64 debian:bullseye AS cross-builder-base
+FROM --platform=linux/amd64 debian:bookworm AS cross-builder-base
 
 ENV \
     LANG="C.UTF-8" \
@@ -13,13 +13,14 @@ WORKDIR /usr/src
 # hadolint ignore=DL3009
 RUN \
     set -x \
-    && apt-get update \
+    && (apt-get update || true) \
     && apt-get install -y --no-install-recommends \
        bash \
        curl \
        ca-certificates \
        build-essential \
-       git
+       git \
+       software-properties-common
 
 FROM --platform=linux/amd64 cross-builder-base AS cross-builder-armv7
 
@@ -33,7 +34,7 @@ ENV ZIGBEED_ARCH=zigbee_arm32
 RUN \
     set -x \
     && dpkg --add-architecture armhf \
-    && apt-get update \
+    && (apt-get update || true) \
     && apt-get install -y --no-install-recommends \
        crossbuild-essential-armhf
 
@@ -49,7 +50,7 @@ ENV ZIGBEED_ARCH=zigbee_arm64
 RUN \
     set -x \
     && dpkg --add-architecture arm64 \
-    && apt-get update \
+    && (apt-get update || true) \
     && apt-get install -y --no-install-recommends \
        crossbuild-essential-arm64
 
@@ -65,7 +66,7 @@ ENV DEBIAN_ARCH=amd64 \
 RUN \
     set -x \
     && dpkg --add-architecture amd64 \
-    && apt-get update \
+    && (apt-get update || true) \
     && apt-get install -y --no-install-recommends \
        crossbuild-essential-amd64
 
@@ -79,7 +80,7 @@ RUN \
     && apt-get install -y --no-install-recommends \
        cmake \
        "libmbedtls-dev:${DEBIAN_ARCH}" \
-       "libmbedtls12:${DEBIAN_ARCH}" \
+       "libmbedtls14:${DEBIAN_ARCH}" \
     && git clone --depth 1 -b "${CPCD_VERSION}" \
        https://github.com/SiliconLabs/cpc-daemon.git \
     && mkdir cpc-daemon/build && cd cpc-daemon/build \
@@ -99,9 +100,11 @@ RUN \
        python3 \
        python3-jinja2 \
        python3-pip \
-       openjdk-17-jre \
+#       openjdk-21-jre \
        git-lfs \
        unzip \
+    && curl -O https://download.oracle.com/java/21/latest/jdk-21_linux-x64_bin.deb \
+    && dpkg -i jdk-21_linux-x64_bin.deb \
     && curl -O https://www.silabs.com/documents/login/software/slc_cli_linux.zip \
     && unzip slc_cli_linux.zip \
     && cd slc_cli/ && chmod +x slc
@@ -136,10 +139,10 @@ RUN \
        --with="${ZIGBEED_ARCH},${SLC_ARCH}" \
        --sdk=$(pwd)/simplicity_sdk \
        --without=zigbee_recommended_linux_arch \
-       --project-file=$(pwd)/simplicity_sdk/protocol/zigbee/app/zigbeed/zigbeed.slcp \
-       --export-destination=$(pwd)/simplicity_sdk/protocol/zigbee/app/zigbeed/output \
+       --project-file=$(pwd)/simplicity_sdk/protocol/zigbee/app/projects/zigbeed/zigbeed.slcp \
+       --export-destination=$(pwd)/simplicity_sdk/protocol/zigbee/app/projects/zigbeed/output \
        --copy-proj-sources \
-  && cd simplicity_sdk/protocol/zigbee/app/zigbeed/output \
+  && cd simplicity_sdk/protocol/zigbee/app/projects/zigbeed/output \
 ##  && patch -p1 < /usr/src/0001-Use-TCP-socket-instead-of-serial-port-main-app.patch \
   && make -f zigbeed.Makefile \
         AR="${DEBIAN_CROSS_PREFIX}-ar" \
@@ -156,9 +159,9 @@ ARG UNIVERSAL_SILABS_FLASHER
 LABEL org.opencontainers.image.source=https://github.com/Se7ven/silabs-multiprotocol-ember
 RUN \
     set -x \
-    && apt-get update \
+    && (apt-get update || true) \
     && apt-get install -y --no-install-recommends \
-       libmbedtls12 \
+       libmbedtls14 \
        socat \
        supervisor \
     && rm -rf /var/lib/apt/lists/* \
@@ -176,7 +179,7 @@ COPY --from=cpcd-builder /usr/local/ /usr/local/
 ENV BORDER_ROUTING=1
 ENV BACKBONE_ROUTER=1
 ENV WEB_GUI=1
-ENV DOCKER 1
+ENV DOCKER=1
 
 COPY otbr-patches/0001-Avoid-writing-to-system-console.patch /usr/src
 COPY otbr-patches/0001-rest-support-erasing-all-persistent-info-1908.patch /usr/src
@@ -185,16 +188,16 @@ COPY otbr-patches/0003-mdns-update-mDNSResponder-to-1790.80.10.patch /usr/src
 COPY otbr-patches/0004-mdns-add-Linux-specific-patches.patch /usr/src
 
 # Required and installed during build (script/bootstrap), could be removed
-ENV OTBR_BUILD_DEPS build-essential ninja-build cmake wget ca-certificates \
+ENV OTBR_BUILD_DEPS="build-essential ninja-build cmake wget ca-certificates \
   libreadline-dev libncurses-dev libcpputest-dev libdbus-1-dev libavahi-common-dev \
   libavahi-client-dev libboost-dev libboost-filesystem-dev libboost-system-dev \
-  libnetfilter-queue-dev
+  libnetfilter-queue-dev"
 
 # Build OTBR natively from Gecko SDK sources
 WORKDIR /usr/src
 RUN \
     set -x \
-    && apt-get update \
+    && (apt-get update || true) \
     # Install npm/nodejs for WebUI manually to avoid systemd getting pulled in \
     && apt-get install -y --no-install-recommends \
        nodejs \
@@ -204,11 +207,12 @@ RUN \
        python3 \
        python3-dev \
        python3-pip \
+       python3-attr \
        python3-aiohttp \
        python3-cryptography \
        python3-yarl \
        lsb-release \
-       netcat \
+       netcat-traditional \
        sudo \
     && cd ot-br-posix \
 #    && patch -p1 < /usr/src/0001-Avoid-writing-to-system-console.patch \
@@ -253,7 +257,7 @@ RUN \
         && cd build/otbr/ \
         && ninja \
         && ninja install) \
-    && pip install universal-silabs-flasher==${UNIVERSAL_SILABS_FLASHER} \
+    && pip install universal-silabs-flasher==${UNIVERSAL_SILABS_FLASHER} --break-system-packages \
     && apt-get purge -y --auto-remove \
        build-essential \
        patch \
@@ -267,7 +271,7 @@ RUN \
     && rm -rf /usr/src/*
 #
 COPY --from=zigbeed-builder \
-     /usr/src/simplicity_sdk/protocol/zigbee/app/zigbeed/output/build/debug/zigbeed \
+     /usr/src/simplicity_sdk/protocol/zigbee/app/projects/zigbeed/output/build/debug/zigbeed \
      /usr/local/bin
 #
 RUN ldconfig && touch /accept_silabs_msla

silabs-multiprotocol-ember/build.yaml

@@ -1,9 +1,9 @@
 ---
 build_from:
-  aarch64: ghcr.io/home-assistant/aarch64-base-debian:bullseye
-  armv7: ghcr.io/home-assistant/armv7-base-debian:bullseye
-  amd64: ghcr.io/home-assistant/amd64-base-debian:bullseye
+  aarch64: ghcr.io/home-assistant/aarch64-base-debian:bookworm
+  armv7: ghcr.io/home-assistant/armv7-base-debian:bookworm
+  amd64: ghcr.io/home-assistant/amd64-base-debian:bookworm
 args:
-  CPCD_VERSION: v4.5.2
-  GECKO_SDK_VERSION: v2024.6.2
+  CPCD_VERSION: v4.7.0
+  GECKO_SDK_VERSION: v2025.6.0
   UNIVERSAL_SILABS_FLASHER: 0.0.22