Update ESP32 images to make it works with ubuntu:24.04 (#34031)

* Add xz package required during building * Fix location of qemu-system-xtensa for newer version of espessif qemu * Update version
project-chip · Sep 16, 2024 · 1116953 · 1116953
1 parent d74701e
commit 1116953
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version
@@ -1 +1 @@
-59 : Install order fix for glib with enabled thread sanitizer.
+60 : Add missing xz for esp32, upfate location of qemu-system-xtensa
diff --git a/integrations/docker/images/stage-2/chip-build-esp32/Dockerfile b/integrations/docker/images/stage-2/chip-build-esp32/Dockerfile
@@ -6,6 +6,7 @@ RUN set -x \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
     git \
+    xz-utils \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/ \
     && : # last line

diff --git a/integrations/docker/images/stage-3/chip-build-esp32-qemu/Dockerfile b/integrations/docker/images/stage-3/chip-build-esp32-qemu/Dockerfile
@@ -19,4 +19,4 @@ RUN set -x \
     && : # last line
 
 ENV QEMU_ESP32_DIR=/opt/espressif/qemu
-ENV QEMU_ESP32=/opt/espressif/qemu/xtensa-softmmu/qemu-system-xtensa
+ENV QEMU_ESP32=/opt/espressif/qemu/qemu-system-xtensa
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		59 : Install order fix for glib with enabled thread sanitizer.
		60 : Add missing xz for esp32, upfate location of qemu-system-xtensa