Update cross compile image to 22.04.1 (#26522)

* Update cross compile dockerfile * Correct the paths * Fix vscode image as well
project-chip · Jul 8, 2023 · 1403880 · 1403880
1 parent 37352e6
commit 1403880
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/integrations/docker/images/chip-build-crosscompile/Dockerfile b/integrations/docker/images/chip-build-crosscompile/Dockerfile
@@ -15,19 +15,19 @@ WORKDIR /opt
 RUN set -x \
     && git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git /opt/depot_tools \
     # TODO: Remove experimental solution to create the sysroot file in cross-compile image
-    && echo 'experimental/matter/sysroot/ubuntu-21.04-aarch64 latest' > ensure_file.txt \
+    && echo 'experimental/matter/sysroot/ubuntu-22.04.1-aarch64 latest' > ensure_file.txt \
     && ./depot_tools/cipd ensure -ensure-file ensure_file.txt -root ./ \
-    && tar xfvJ ubuntu-21.04-aarch64-sysroot.tar.xz \
-    && rm -rf /opt/ubuntu-21.04-aarch64-sysroot/usr/lib/firmware \
-    && rm -rf /opt/ubuntu-21.04-aarch64-sysroot/usr/lib/git-core \
-    && rm -rf /opt/ubuntu-21.04-aarch64-sysroot/usr/lib/modules \
-    && rm -rf /opt/ubuntu-21.04-aarch64-sysroot/lib/firmware \
-    && rm -rf /opt/ubuntu-21.04-aarch64-sysroot/lib/git-core \
-    && rm -rf /opt/ubuntu-21.04-aarch64-sysroot/lib/modules \
+    && tar xfvJ ubuntu-22.04.1-aarch64-sysroot.tar.xz \
+    && rm -rf /opt/ubuntu-22.04.1-aarch64-sysroot/usr/lib/firmware \
+    && rm -rf /opt/ubuntu-22.04.1-aarch64-sysroot/usr/lib/git-core \
+    && rm -rf /opt/ubuntu-22.04.1-aarch64-sysroot/usr/lib/modules \
+    && rm -rf /opt/ubuntu-22.04.1-aarch64-sysroot/lib/firmware \
+    && rm -rf /opt/ubuntu-22.04.1-aarch64-sysroot/lib/git-core \
+    && rm -rf /opt/ubuntu-22.04.1-aarch64-sysroot/lib/modules \
     && : # last line
 
 FROM connectedhomeip/chip-build:${VERSION}
 
-COPY --from=build /opt/ubuntu-21.04-aarch64-sysroot/ /opt/ubuntu-21.04-aarch64-sysroot/
+COPY --from=build /opt/ubuntu-22.04.1-aarch64-sysroot/ /opt/ubuntu-22.04-aarch64-sysroot/
 
-ENV SYSROOT_AARCH64=/opt/ubuntu-21.04-aarch64-sysroot
+ENV SYSROOT_AARCH64=/opt/ubuntu-22.04.1-aarch64-sysroot
diff --git a/integrations/docker/images/chip-build-vscode/Dockerfile b/integrations/docker/images/chip-build-vscode/Dockerfile
@@ -40,7 +40,7 @@ COPY --from=telink /opt/telink/zephyr-sdk-0.15.2 /opt/telink/zephyr-sdk-0.15.2
 
 COPY --from=tizen /opt/tizen-sdk /opt/tizen-sdk
 
-COPY --from=crosscompile /opt/ubuntu-21.04-aarch64-sysroot /opt/ubuntu-21.04-aarch64-sysroot
+COPY --from=crosscompile /opt/ubuntu-22.04.1-aarch64-sysroot /opt/ubuntu-22.04.1-aarch64-sysroot
 
 COPY --from=ameba /opt/ameba /opt/ameba
 
@@ -105,7 +105,7 @@ ENV OPENOCD_PATH=/opt/openocd/
 ENV PW_ENVIRONMENT_ROOT=/home/vscode/pigweed/env
 ENV QEMU_ESP32=/opt/espressif/qemu/xtensa-softmmu/qemu-system-xtensa
 ENV QEMU_ESP32_DIR=/opt/espressif/qemu
-ENV SYSROOT_AARCH64=/opt/ubuntu-21.04-aarch64-sysroot
+ENV SYSROOT_AARCH64=/opt/ubuntu-22.04.1-aarch64-sysroot
 ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr
 ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.15.2
 ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.13.0

diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version
@@ -1 +1 @@
-0.7.7 Version bump reason: [Ameba] fix runtime dct error and error mapping
+0.7.8 Version bump reason: Update crosscompile sysroot to Ubuntu 22.04.01
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0.7.7 Version bump reason: [Ameba] fix runtime dct error and error mapping
		0.7.8 Version bump reason: Update crosscompile sysroot to Ubuntu 22.04.01