@@ -19,18 +19,17 @@ RUN set -x \
19
19
# TODO: Remove experimental solution to create the sysroot file in cross-compile image
20
20
&& echo 'experimental/matter/sysroot/ubuntu-24.04-aarch64 version:build-2025.01.28' > ensure_file.txt \
21
21
&& ./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 \
29
28
&& : # last line
30
29
31
30
FROM ghcr.io/project-chip/chip-build:${VERSION}
32
31
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
33
32
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/
35
34
36
- ENV SYSROOT_AARCH64=/opt/ubuntu-24.04.1 -aarch64-sysroot
35
+ ENV SYSROOT_AARCH64=/opt/ubuntu-24.04-aarch64-sysroot
0 commit comments