From 1160747cc73409a6fb2dad3900043f3b97a995c1 Mon Sep 17 00:00:00 2001 From: Jakub Latusek Date: Thu, 20 Jun 2024 20:08:49 +0200 Subject: [PATCH] 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 --- integrations/docker/images/base/chip-build/version | 2 +- integrations/docker/images/stage-2/chip-build-esp32/Dockerfile | 1 + .../docker/images/stage-3/chip-build-esp32-qemu/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version index 375ee709695659..d279dc8c9ad000 100644 --- 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 index 7dd8d382b258ff..2e41b6b3466e27 100644 --- 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 index aad71b4f2b7ff0..0eb76b44a3cbc0 100644 --- 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