@@ -3,34 +3,34 @@ FROM ghcr.io/project-chip/chip-build:${VERSION} as build
3
3
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
4
4
5
5
RUN set -x \
6
- && apt-get update \
7
- && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
8
- git \
9
- xz-utils \
10
- && apt-get clean \
11
- && rm -rf /var/lib/apt/lists/ \
12
- && : # last line
6
+ && apt-get update \
7
+ && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
8
+ git \
9
+ xz-utils \
10
+ && apt-get clean \
11
+ && rm -rf /var/lib/apt/lists/ \
12
+ && : # last line
13
13
14
14
WORKDIR /opt
15
15
# Unpack the sysroot, while also removing some rather large items in it that
16
16
# are generally not required for compilation
17
17
RUN set -x \
18
- && git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git /opt/depot_tools \
19
- # TODO: Remove experimental solution to create the sysroot file in cross-compile image
20
- && echo 'experimental/matter/sysroot/ubuntu-24.04-aarch64 version:build-2025.01.28' > ensure_file.txt \
21
- && ./depot_tools/cipd ensure -ensure-file ensure_file.txt -root ./ \
22
- && tar xfvJ ubuntu-22 .04.1-aarch64-sysroot.tar.xz \
23
- && rm -rf /opt/ubuntu-22 .04.1-aarch64-sysroot/usr/lib/firmware \
24
- && rm -rf /opt/ubuntu-22 .04.1-aarch64-sysroot/usr/lib/git-core \
25
- && rm -rf /opt/ubuntu-22 .04.1-aarch64-sysroot/usr/lib/modules \
26
- && rm -rf /opt/ubuntu-22 .04.1-aarch64-sysroot/lib/firmware \
27
- && rm -rf /opt/ubuntu-22 .04.1-aarch64-sysroot/lib/git-core \
28
- && rm -rf /opt/ubuntu-22 .04.1-aarch64-sysroot/lib/modules \
29
- && : # last line
18
+ && git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git /opt/depot_tools \
19
+ # TODO: Remove experimental solution to create the sysroot file in cross-compile image
20
+ && echo 'experimental/matter/sysroot/ubuntu-24.04-aarch64 version:build-2025.01.28' > ensure_file.txt \
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 \
29
+ && : # last line
30
30
31
31
FROM ghcr.io/project-chip/chip-build:${VERSION}
32
32
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
33
33
34
- COPY --from=build /opt/ubuntu-22 .04.1-aarch64-sysroot/ /opt/ubuntu-22 .04.1-aarch64-sysroot/
34
+ COPY --from=build /opt/ubuntu-24 .04.1-aarch64-sysroot/ /opt/ubuntu-24 .04.1-aarch64-sysroot/
35
35
36
- ENV SYSROOT_AARCH64=/opt/ubuntu-22 .04.1-aarch64-sysroot
36
+ ENV SYSROOT_AARCH64=/opt/ubuntu-24 .04.1-aarch64-sysroot
0 commit comments