Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More crosscompile docker image fixing: fix paths and tar #37304

Merged
merged 1 commit into from
Jan 29, 2025
Merged

More crosscompile docker image fixing: fix paths and tar #37304

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions integrations/docker/images/stage-1/chip-build-crosscompile/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,17 @@ RUN set -x \
# 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 \
&& rm -rf /opt/ubuntu-24.04-aarch64-sysroot/usr/lib/firmware \
&& rm -rf /opt/ubuntu-24.04-aarch64-sysroot/usr/lib/git-core \
&& rm -rf /opt/ubuntu-24.04-aarch64-sysroot/usr/lib/modules \
&& rm -rf /opt/ubuntu-24.04-aarch64-sysroot/lib/firmware \
&& rm -rf /opt/ubuntu-24.04-aarch64-sysroot/lib/git-core \
&& rm -rf /opt/ubuntu-24.04-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-24.04.1-aarch64-sysroot/ /opt/ubuntu-24.04.1-aarch64-sysroot/
COPY --from=build /opt/ubuntu-24.04-aarch64-sysroot/ /opt/ubuntu-24.04-aarch64-sysroot/

ENV SYSROOT_AARCH64=/opt/ubuntu-24.04.1-aarch64-sysroot
ENV SYSROOT_AARCH64=/opt/ubuntu-24.04-aarch64-sysroot
Loading