-
Notifications
You must be signed in to change notification settings - Fork 316
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[main] Update dependencies from dotnet/arcade (#4616)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Amaury Levé <amauryleve@microsoft.com>
- Loading branch information
3 people
committed
Oct 30, 2023
1 parent
aafbf35
commit 916af66
Showing
63 changed files
with
664 additions
and
323 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so | ||
| --- a/usr/lib64/libc.so 2016-12-30 23:00:08.284951863 +0900 | ||
| +++ b/usr/lib64/libc.so 2016-12-30 23:00:32.140951815 +0900 | ||
| @@ -2,4 +2,4 @@ | ||
| Use the shared library, but some functions are only in | ||
| the static library, so try that secondarily. */ | ||
| OUTPUT_FORMAT(elf64-littleriscv) | ||
| -GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-riscv64-lp64d.so.1 ) ) | ||
| +GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-riscv64-lp64d.so.1 ) ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| # getNonPortableDistroRid | ||
| # | ||
| # Input: | ||
| # targetOs: (str) | ||
| # targetArch: (str) | ||
| # rootfsDir: (str) | ||
| # | ||
| # Return: | ||
| # non-portable rid | ||
| getNonPortableDistroRid() | ||
| { | ||
| local targetOs="$1" | ||
| local targetArch="$2" | ||
| local rootfsDir="$3" | ||
| local nonPortableRid="" | ||
|
|
||
| if [ "$targetOs" = "linux" ]; then | ||
| if [ -e "${rootfsDir}/etc/os-release" ]; then | ||
| source "${rootfsDir}/etc/os-release" | ||
|
|
||
| if [[ "${ID}" == "rhel" || "${ID}" == "rocky" || "${ID}" == "alpine" ]]; then | ||
| # remove the last version digit | ||
| VERSION_ID="${VERSION_ID%.*}" | ||
| fi | ||
|
|
||
| if [[ "${VERSION_ID:-}" =~ ^([[:digit:]]|\.)+$ ]]; then | ||
| nonPortableRid="${ID}.${VERSION_ID}-${targetArch}" | ||
| else | ||
| # Rolling release distros either do not set VERSION_ID, set it as blank or | ||
| # set it to non-version looking string (such as TEMPLATE_VERSION_ID on ArchLinux); | ||
| # so omit it here to be consistent with everything else. | ||
| nonPortableRid="${ID}-${targetArch}" | ||
| fi | ||
|
|
||
| elif [ -e "${rootfsDir}/android_platform" ]; then | ||
| source "$rootfsDir"/android_platform | ||
| nonPortableRid="$RID" | ||
| fi | ||
| fi | ||
|
|
||
| if [ "$targetOs" = "freebsd" ]; then | ||
| # $rootfsDir can be empty. freebsd-version is shell script and it should always work. | ||
| __freebsd_major_version=$($rootfsDir/bin/freebsd-version | { read v; echo "${v%%.*}"; }) | ||
| nonPortableRid="freebsd.$__freebsd_major_version-${targetArch}" | ||
| elif command -v getprop && getprop ro.product.system.model 2>&1 | grep -qi android; then | ||
| __android_sdk_version=$(getprop ro.build.version.sdk) | ||
| nonPortableRid="android.$__android_sdk_version-${targetArch}" | ||
| elif [ "$targetOs" = "illumos" ]; then | ||
| __uname_version=$(uname -v) | ||
| case "$__uname_version" in | ||
| omnios-*) | ||
| __omnios_major_version=$(echo "${__uname_version:8:2}") | ||
| nonPortableRid=omnios."$__omnios_major_version"-"$targetArch" | ||
| ;; | ||
| joyent_*) | ||
| __smartos_major_version=$(echo "${__uname_version:7:4}") | ||
| nonPortableRid=smartos."$__smartos_major_version"-"$targetArch" | ||
| ;; | ||
| illumos_*) | ||
| nonPortableRid=openindiana-"$targetArch" | ||
| ;; | ||
| esac | ||
| elif [ "$targetOs" = "solaris" ]; then | ||
| __uname_version=$(uname -v) | ||
| __solaris_major_version=$(echo "${__uname_version%.*}") | ||
| nonPortableRid=solaris."$__solaris_major_version"-"$targetArch" | ||
| elif [ "$targetOs" = "haiku" ]; then | ||
| __uname_release=$(uname -r) | ||
| nonPortableRid=haiku.r"$__uname_release"-"$targetArch" | ||
| fi | ||
|
|
||
| echo "$(echo $nonPortableRid | tr '[:upper:]' '[:lower:]')" | ||
| } | ||
|
|
||
| # initDistroRidGlobal | ||
| # | ||
| # Input: | ||
| # os: (str) | ||
| # arch: (str) | ||
| # rootfsDir?: (nullable:string) | ||
| # | ||
| # Return: | ||
| # None | ||
| # | ||
| # Notes: | ||
| # | ||
| # It is important to note that the function does not return anything, but it | ||
| # exports the following variables on success: | ||
| # | ||
| # __DistroRid : Non-portable rid of the target platform. | ||
| # __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform. | ||
| # | ||
| initDistroRidGlobal() | ||
| { | ||
| local targetOs="$1" | ||
| local targetArch="$2" | ||
| local rootfsDir="" | ||
| if [ "$#" -ge 3 ]; then | ||
| rootfsDir="$3" | ||
| fi | ||
|
|
||
| if [ -n "${rootfsDir}" ]; then | ||
| # We may have a cross build. Check for the existence of the rootfsDir | ||
| if [ ! -e "${rootfsDir}" ]; then | ||
| echo "Error rootfsDir has been passed, but the location is not valid." | ||
| exit 1 | ||
| fi | ||
| fi | ||
|
|
||
| __DistroRid=$(getNonPortableDistroRid "${targetOs}" "${targetArch}" "${rootfsDir}") | ||
|
|
||
| if [ -z "${__PortableTargetOS:-}" ]; then | ||
| __PortableTargetOS="$targetOs" | ||
|
|
||
| STRINGS="$(command -v strings || true)" | ||
| if [ -z "$STRINGS" ]; then | ||
| STRINGS="$(command -v llvm-strings || true)" | ||
| fi | ||
|
|
||
| # Check for musl-based distros (e.g Alpine Linux, Void Linux). | ||
| if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl || | ||
| ( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then | ||
| __PortableTargetOS="linux-musl" | ||
| fi | ||
| fi | ||
|
|
||
| export __DistroRid __PortableTargetOS | ||
| } |
Oops, something went wrong.