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

Target lower glibc for Linux arm64 #80939

Merged
merged 2 commits into from
Jan 27, 2023
Merged

Target lower glibc for Linux arm64 #80939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
923fd5d
Target lower glibc for Linux arm64
sbomer Jan 19, 2023
2673d22
Set prefix for mono
sbomer Jan 26, 2023
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
4 changes: 2 additions & 2 deletions eng/pipelines/common/templates/pipeline-with-resources.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ resources:
ROOTFS_DIR: /crossrootfs/armv6

- container: linux_arm64
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-cross-arm64
env:
ROOTFS_DIR: /crossrootfs/arm64
ROOTFS_DIR: /crossrootfs
Copy link
Member

@am11 am11 Jan 21, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This convention is documented in number of places. Lets not introduce a break because everyone using these prereq images outside this CI (for years) remember the default location of ROOTFS_DIR.

eng/pipelines/common/templates/pipeline-with-resources.yml:        ROOTFS_DIR: /crossrootfs/arm
eng/pipelines/common/templates/pipeline-with-resources.yml:        ROOTFS_DIR: /crossrootfs/armv6
eng/pipelines/common/templates/pipeline-with-resources.yml:        ROOTFS_DIR: /crossrootfs/arm64
eng/pipelines/common/templates/pipeline-with-resources.yml:        ROOTFS_DIR: /crossrootfs/arm
eng/pipelines/common/templates/pipeline-with-resources.yml:        ROOTFS_DIR: /crossrootfs/arm64
eng/pipelines/common/templates/pipeline-with-resources.yml:        ROOTFS_DIR: /crossrootfs/x86
eng/pipelines/common/templates/pipeline-with-resources.yml:        ROOTFS_DIR: /crossrootfs/s390x
eng/pipelines/common/templates/pipeline-with-resources.yml:        ROOTFS_DIR: /crossrootfs/ppc64le
eng/pipelines/common/templates/pipeline-with-resources.yml:        ROOTFS_DIR: /crossrootfs/x64
eng/pipelines/common/templates/pipeline-with-resources.yml:        ROOTFS_DIR: /crossrootfs/armel

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When I updated the build images, the change to the rootfs dir was unintentional. Fixing it in dotnet/dotnet-buildtools-prereqs-docker#781.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will update dotnet/runtime once the fix is rolled out.


- container: linux_musl_x64
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.13-WithNode
Expand Down
1 change: 1 addition & 0 deletions src/mono/mono.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,6 +711,7 @@
<MonoAotAbi>aarch64-linux-gnu</MonoAotAbi>
<MonoAotOffsetsFile>$(MonoObjCrossDir)offsets-aarch-linux-gnu.h</MonoAotOffsetsFile>
<MonoAotOffsetsPrefix>$(MonoCrossDir)/usr/lib/gcc/aarch64-linux-gnu/7</MonoAotOffsetsPrefix>
<MonoAotOffsetsPrefix Condition="'$(Platform)' == 'arm64'">$(MonoCrossDir)/usr/lib/gcc/aarch64-linux-gnu/5</MonoAotOffsetsPrefix>
</PropertyGroup>

<!-- macOS host specific options -->
Expand Down