Skip to content

Commit

Permalink
Support musl-libc based linux RIDs
Browse files Browse the repository at this point in the history 
- Add `linux-musl` RID
- Set `alpine`'s parent to `linux-musl`
- Add `alpine.3.7` to the graph
- Fix up `android` to inherit from `unix` while we are here

Fixes https://github.com/dotnet/core-setup/issues/3817
  • Loading branch information
@eerhardt
eerhardt committed Mar 29, 2018
1 parent f14366b commit d7c64e6
Show file tree
Hide file tree
Showing 3 changed files with 355 additions and 15 deletions.
233 changes: 232 additions & 1 deletion pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
{
"alpine": [
"alpine",
"linux-musl",
"unix",
"any",
"base"
],
"alpine-corert": [
"alpine-corert",
"alpine",
"linux-musl-corert",
"linux-musl",
"unix-corert",
"unix",
"corert",
Expand All @@ -17,6 +20,8 @@
"alpine-x64": [
"alpine-x64",
"alpine",
"linux-musl-x64",
"linux-musl",
"unix-x64",
"unix",
"any",
Expand All @@ -26,8 +31,12 @@
"alpine-x64-corert",
"alpine-corert",
"alpine-x64",
"unix-x64-corert",
"linux-musl-x64-corert",
"alpine",
"linux-musl-corert",
"linux-musl-x64",
"unix-x64-corert",
"linux-musl",
"unix-corert",
"unix-x64",
"unix",
Expand All @@ -38,6 +47,7 @@
"alpine.3.6": [
"alpine.3.6",
"alpine",
"linux-musl",
"unix",
"any",
"base"
Expand All @@ -47,6 +57,8 @@
"alpine.3.6",
"alpine-corert",
"alpine",
"linux-musl-corert",
"linux-musl",
"unix-corert",
"unix",
"corert",
Expand All @@ -58,6 +70,8 @@
"alpine.3.6",
"alpine-x64",
"alpine",
"linux-musl-x64",
"linux-musl",
"unix-x64",
"unix",
"any",
Expand All @@ -72,6 +86,73 @@
"alpine-corert",
"alpine-x64",
"alpine",
"linux-musl-x64-corert",
"linux-musl-corert",
"linux-musl-x64",
"linux-musl",
"unix-x64-corert",
"unix-corert",
"unix-x64",
"unix",
"corert",
"any",
"base"
],
"alpine.3.7": [
"alpine.3.7",
"alpine.3.6",
"alpine",
"linux-musl",
"unix",
"any",
"base"
],
"alpine.3.7-corert": [
"alpine.3.7-corert",
"alpine.3.7",
"alpine.3.6-corert",
"alpine.3.6",
"alpine-corert",
"alpine",
"linux-musl-corert",
"linux-musl",
"unix-corert",
"unix",
"corert",
"any",
"base"
],
"alpine.3.7-x64": [
"alpine.3.7-x64",
"alpine.3.7",
"alpine.3.6-x64",
"alpine.3.6",
"alpine-x64",
"alpine",
"linux-musl-x64",
"linux-musl",
"unix-x64",
"unix",
"any",
"base"
],
"alpine.3.7-x64-corert": [
"alpine.3.7-x64-corert",
"alpine.3.7-corert",
"alpine.3.7-x64",
"alpine.3.7",
"alpine.3.6-x64-corert",
"alpine.3.6-corert",
"alpine.3.6-x64",
"alpine.3.6",
"alpine-x64-corert",
"alpine-corert",
"alpine-x64",
"alpine",
"linux-musl-x64-corert",
"linux-musl-corert",
"linux-musl-x64",
"linux-musl",
"unix-x64-corert",
"unix-corert",
"unix-x64",
Expand All @@ -82,49 +163,65 @@
],
"android": [
"android",
"unix",
"any",
"base"
],
"android-arm": [
"android-arm",
"android",
"unix-arm",
"unix",
"any",
"base"
],
"android-arm-corert": [
"android-arm-corert",
"android-corert",
"android-arm",
"unix-arm-corert",
"android",
"unix-corert",
"unix-arm",
"unix",
"corert",
"any",
"base"
],
"android-arm64": [
"android-arm64",
"android",
"unix-arm64",
"unix",
"any",
"base"
],
"android-arm64-corert": [
"android-arm64-corert",
"android-corert",
"android-arm64",
"unix-arm64-corert",
"android",
"unix-corert",
"unix-arm64",
"unix",
"corert",
"any",
"base"
],
"android-corert": [
"android-corert",
"android",
"unix-corert",
"unix",
"corert",
"any",
"base"
],
"android.21": [
"android.21",
"android",
"unix",
"any",
"base"
],
Expand All @@ -133,6 +230,8 @@
"android.21",
"android-arm",
"android",
"unix-arm",
"unix",
"any",
"base"
],
Expand All @@ -145,6 +244,10 @@
"android-corert",
"android-arm",
"android",
"unix-arm-corert",
"unix-corert",
"unix-arm",
"unix",
"corert",
"any",
"base"
Expand All @@ -154,6 +257,8 @@
"android.21",
"android-arm64",
"android",
"unix-arm64",
"unix",
"any",
"base"
],
Expand All @@ -166,6 +271,10 @@
"android-corert",
"android-arm64",
"android",
"unix-arm64-corert",
"unix-corert",
"unix-arm64",
"unix",
"corert",
"any",
"base"
Expand All @@ -175,6 +284,8 @@
"android.21",
"android-corert",
"android",
"unix-corert",
"unix",
"corert",
"any",
"base"
Expand Down Expand Up @@ -1338,6 +1449,126 @@
"any",
"base"
],
"linux-musl": [
"linux-musl",
"unix",
"any",
"base"
],
"linux-musl-arm": [
"linux-musl-arm",
"linux-musl",
"unix-arm",
"unix",
"any",
"base"
],
"linux-musl-arm-corert": [
"linux-musl-arm-corert",
"linux-musl-corert",
"linux-musl-arm",
"unix-arm-corert",
"linux-musl",
"unix-corert",
"unix-arm",
"unix",
"corert",
"any",
"base"
],
"linux-musl-arm64": [
"linux-musl-arm64",
"linux-musl",
"unix-arm64",
"unix",
"any",
"base"
],
"linux-musl-arm64-corert": [
"linux-musl-arm64-corert",
"linux-musl-corert",
"linux-musl-arm64",
"unix-arm64-corert",
"linux-musl",
"unix-corert",
"unix-arm64",
"unix",
"corert",
"any",
"base"
],
"linux-musl-armel": [
"linux-musl-armel",
"linux-musl",
"unix-armel",
"unix",
"any",
"base"
],
"linux-musl-armel-corert": [
"linux-musl-armel-corert",
"linux-musl-corert",
"linux-musl-armel",
"unix-armel-corert",
"linux-musl",
"unix-corert",
"unix-armel",
"unix",
"corert",
"any",
"base"
],
"linux-musl-corert": [
"linux-musl-corert",
"linux-musl",
"unix-corert",
"unix",
"corert",
"any",
"base"
],
"linux-musl-x64": [
"linux-musl-x64",
"linux-musl",
"unix-x64",
"unix",
"any",
"base"
],
"linux-musl-x64-corert": [
"linux-musl-x64-corert",
"linux-musl-corert",
"linux-musl-x64",
"unix-x64-corert",
"linux-musl",
"unix-corert",
"unix-x64",
"unix",
"corert",
"any",
"base"
],
"linux-musl-x86": [
"linux-musl-x86",
"linux-musl",
"unix-x86",
"unix",
"any",
"base"
],
"linux-musl-x86-corert": [
"linux-musl-x86-corert",
"linux-musl-corert",
"linux-musl-x86",
"unix-x86-corert",
"linux-musl",
"unix-corert",
"unix-x86",
"unix",
"corert",
"any",
"base"
],
"linux-x64": [
"linux-x64",
"linux",
Expand Down
Loading

0 comments on commit d7c64e6

Please sign in to comment.