Fix sysroot paths (project-chip#37303)

espressif · Jan 29, 2025 · bb4ba89 · bb4ba89
1 parent 2399e42
commit bb4ba89
Showing 1 changed file with 21 additions and 21 deletions.
diff --git a/integrations/docker/images/stage-1/chip-build-crosscompile/Dockerfile b/integrations/docker/images/stage-1/chip-build-crosscompile/Dockerfile
@@ -3,34 +3,34 @@ FROM ghcr.io/project-chip/chip-build:${VERSION} as build
 LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
 
 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
+  && 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
 
 WORKDIR /opt
 # Unpack the sysroot, while also removing some rather large items in it that
 # are generally not required for compilation
 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-24.04-aarch64 version:build-2025.01.28' > ensure_file.txt \
-    && ./depot_tools/cipd ensure -ensure-file ensure_file.txt -root ./ \
-    && 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
+  && 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-24.04-aarch64 version:build-2025.01.28' > ensure_file.txt \
+  && ./depot_tools/cipd ensure -ensure-file ensure_file.txt -root ./ \
+  && tar xfvJ ubuntu-24.04.1-aarch64-sysroot.tar.xz \
+  && rm -rf /opt/ubuntu-24.04.1-aarch64-sysroot/usr/lib/firmware \
+  && rm -rf /opt/ubuntu-24.04.1-aarch64-sysroot/usr/lib/git-core \
+  && rm -rf /opt/ubuntu-24.04.1-aarch64-sysroot/usr/lib/modules \
+  && rm -rf /opt/ubuntu-24.04.1-aarch64-sysroot/lib/firmware \
+  && rm -rf /opt/ubuntu-24.04.1-aarch64-sysroot/lib/git-core \
+  && rm -rf /opt/ubuntu-24.04.1-aarch64-sysroot/lib/modules \
+  && : # last line
 
 FROM ghcr.io/project-chip/chip-build:${VERSION}
 LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
 
-COPY --from=build /opt/ubuntu-22.04.1-aarch64-sysroot/ /opt/ubuntu-22.04.1-aarch64-sysroot/
+COPY --from=build /opt/ubuntu-24.04.1-aarch64-sysroot/ /opt/ubuntu-24.04.1-aarch64-sysroot/
 
-ENV SYSROOT_AARCH64=/opt/ubuntu-22.04.1-aarch64-sysroot
+ENV SYSROOT_AARCH64=/opt/ubuntu-24.04.1-aarch64-sysroot