Skip to content

Commit bb4ba89

Browse files
authored
Fix sysroot paths (project-chip#37303)
1 parent 2399e42 commit bb4ba89

File tree

1 file changed

+21
-21
lines changed
  • integrations/docker/images/stage-1/chip-build-crosscompile

1 file changed

+21
-21
lines changed

integrations/docker/images/stage-1/chip-build-crosscompile/Dockerfile

+21-21
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,34 @@ FROM ghcr.io/project-chip/chip-build:${VERSION} as build
33
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
44

55
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
1313

1414
WORKDIR /opt
1515
# Unpack the sysroot, while also removing some rather large items in it that
1616
# are generally not required for compilation
1717
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
3030

3131
FROM ghcr.io/project-chip/chip-build:${VERSION}
3232
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
3333

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/
3535

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

Comments
 (0)