@@ -19,18 +19,17 @@ RUN set -x \
1919 # TODO: Remove experimental solution to create the sysroot file in cross-compile image
2020 && echo 'experimental/matter/sysroot/ubuntu-24.04-aarch64 version:build-2025.01.28' > ensure_file.txt \
2121 && ./depot_tools/cipd ensure -ensure-file ensure_file.txt -root ./ \
22- && tar xfvJ ubuntu-24.04.1-aarch64-sysroot.tar.xz \
23- && rm -rf /opt/ubuntu-24.04.1-aarch64-sysroot/usr/lib/firmware \
24- && rm -rf /opt/ubuntu-24.04.1-aarch64-sysroot/usr/lib/git-core \
25- && rm -rf /opt/ubuntu-24.04.1-aarch64-sysroot/usr/lib/modules \
26- && rm -rf /opt/ubuntu-24.04.1-aarch64-sysroot/lib/firmware \
27- && rm -rf /opt/ubuntu-24.04.1-aarch64-sysroot/lib/git-core \
28- && rm -rf /opt/ubuntu-24.04.1-aarch64-sysroot/lib/modules \
22+ && rm -rf /opt/ubuntu-24.04-aarch64-sysroot/usr/lib/firmware \
23+ && rm -rf /opt/ubuntu-24.04-aarch64-sysroot/usr/lib/git-core \
24+ && rm -rf /opt/ubuntu-24.04-aarch64-sysroot/usr/lib/modules \
25+ && rm -rf /opt/ubuntu-24.04-aarch64-sysroot/lib/firmware \
26+ && rm -rf /opt/ubuntu-24.04-aarch64-sysroot/lib/git-core \
27+ && rm -rf /opt/ubuntu-24.04-aarch64-sysroot/lib/modules \
2928 && : # last line
3029
3130FROM ghcr.io/project-chip/chip-build:${VERSION}
3231LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
3332
34- COPY --from=build /opt/ubuntu-24.04.1 -aarch64-sysroot/ /opt/ubuntu-24.04.1 -aarch64-sysroot/
33+ COPY --from=build /opt/ubuntu-24.04-aarch64-sysroot/ /opt/ubuntu-24.04-aarch64-sysroot/
3534
36- ENV SYSROOT_AARCH64=/opt/ubuntu-24.04.1 -aarch64-sysroot
35+ ENV SYSROOT_AARCH64=/opt/ubuntu-24.04-aarch64-sysroot
0 commit comments