From: Omair Majid <omajid@redhat.com>
Date: Tue, 16 Jul 2019 18:44:51 +0000 (-0400)
Subject: Add arm64 runtime ids for Fedora and RHEL 8
X-Git-Tag: submit/tizen/20210909.063632~11031^2~913
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b9bf83ddd639c9902e283d2a64e527e7120135b7;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Add arm64 runtime ids for Fedora and RHEL 8

Both Fedora and RHEL 8 have arm64 (aka aarch64) among the primary/main
architectures they support.

Fedora includes aarch64 as a "Primary Architecture":
https://fedoraproject.org/wiki/Architectures#Primary_Architectures

RHEL 8 lists aarch64 right next to x86_64 in the developer download site:
https://developers.redhat.com/products/rhel/download

Commit migrated from https://github.com/dotnet/corefx/commit/ec18a81e92f531343ea754d355c6d2665d36c2ef
---

diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
index cebc7b4..76259c8 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
@@ -587,6 +587,16 @@
     "any",
     "base"
   ],
+  "fedora-arm64": [
+    "fedora-arm64",
+    "fedora",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
   "fedora-x64": [
     "fedora-x64",
     "fedora",
@@ -605,6 +615,18 @@
     "any",
     "base"
   ],
+  "fedora.23-arm64": [
+    "fedora.23-arm64",
+    "fedora.23",
+    "fedora-arm64",
+    "fedora",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
   "fedora.23-x64": [
     "fedora.23-x64",
     "fedora.23",
@@ -625,6 +647,18 @@
     "any",
     "base"
   ],
+  "fedora.24-arm64": [
+    "fedora.24-arm64",
+    "fedora.24",
+    "fedora-arm64",
+    "fedora",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
   "fedora.24-x64": [
     "fedora.24-x64",
     "fedora.24",
@@ -645,6 +679,18 @@
     "any",
     "base"
   ],
+  "fedora.25-arm64": [
+    "fedora.25-arm64",
+    "fedora.25",
+    "fedora-arm64",
+    "fedora",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
   "fedora.25-x64": [
     "fedora.25-x64",
     "fedora.25",
@@ -665,6 +711,18 @@
     "any",
     "base"
   ],
+  "fedora.26-arm64": [
+    "fedora.26-arm64",
+    "fedora.26",
+    "fedora-arm64",
+    "fedora",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
   "fedora.26-x64": [
     "fedora.26-x64",
     "fedora.26",
@@ -685,6 +743,18 @@
     "any",
     "base"
   ],
+  "fedora.27-arm64": [
+    "fedora.27-arm64",
+    "fedora.27",
+    "fedora-arm64",
+    "fedora",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
   "fedora.27-x64": [
     "fedora.27-x64",
     "fedora.27",
@@ -705,6 +775,18 @@
     "any",
     "base"
   ],
+  "fedora.28-arm64": [
+    "fedora.28-arm64",
+    "fedora.28",
+    "fedora-arm64",
+    "fedora",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
   "fedora.28-x64": [
     "fedora.28-x64",
     "fedora.28",
@@ -725,6 +807,18 @@
     "any",
     "base"
   ],
+  "fedora.29-arm64": [
+    "fedora.29-arm64",
+    "fedora.29",
+    "fedora-arm64",
+    "fedora",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
   "fedora.29-x64": [
     "fedora.29-x64",
     "fedora.29",
@@ -745,6 +839,18 @@
     "any",
     "base"
   ],
+  "fedora.30-arm64": [
+    "fedora.30-arm64",
+    "fedora.30",
+    "fedora-arm64",
+    "fedora",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
   "fedora.30-x64": [
     "fedora.30-x64",
     "fedora.30",
@@ -765,6 +871,18 @@
     "any",
     "base"
   ],
+  "fedora.31-arm64": [
+    "fedora.31-arm64",
+    "fedora.31",
+    "fedora-arm64",
+    "fedora",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
   "fedora.31-x64": [
     "fedora.31-x64",
     "fedora.31",
@@ -2116,6 +2234,16 @@
     "any",
     "base"
   ],
+  "rhel-arm64": [
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
   "rhel-x64": [
     "rhel-x64",
     "rhel",
@@ -2398,6 +2526,18 @@
     "any",
     "base"
   ],
+  "rhel.8-arm64": [
+    "rhel.8-arm64",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
   "rhel.8-x64": [
     "rhel.8-x64",
     "rhel.8",
@@ -2419,6 +2559,20 @@
     "any",
     "base"
   ],
+  "rhel.8.0-arm64": [
+    "rhel.8.0-arm64",
+    "rhel.8.0",
+    "rhel.8-arm64",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
   "rhel.8.0-x64": [
     "rhel.8.0-x64",
     "rhel.8.0",
@@ -2443,6 +2597,22 @@
     "any",
     "base"
   ],
+  "rhel.8.1-arm64": [
+    "rhel.8.1-arm64",
+    "rhel.8.1",
+    "rhel.8.0-arm64",
+    "rhel.8.0",
+    "rhel.8-arm64",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
   "rhel.8.1-x64": [
     "rhel.8.1-x64",
     "rhel.8.1",
diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
index cdf302f..4cac2a6 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
@@ -293,6 +293,12 @@
         "linux"
       ]
     },
+    "fedora-arm64": {
+      "#import": [
+        "fedora",
+        "linux-arm64"
+      ]
+    },
     "fedora-x64": {
       "#import": [
         "fedora",
@@ -304,6 +310,12 @@
         "fedora"
       ]
     },
+    "fedora.23-arm64": {
+      "#import": [
+        "fedora.23",
+        "fedora-arm64"
+      ]
+    },
     "fedora.23-x64": {
       "#import": [
         "fedora.23",
@@ -315,6 +327,12 @@
         "fedora"
       ]
     },
+    "fedora.24-arm64": {
+      "#import": [
+        "fedora.24",
+        "fedora-arm64"
+      ]
+    },
     "fedora.24-x64": {
       "#import": [
         "fedora.24",
@@ -326,6 +344,12 @@
         "fedora"
       ]
     },
+    "fedora.25-arm64": {
+      "#import": [
+        "fedora.25",
+        "fedora-arm64"
+      ]
+    },
     "fedora.25-x64": {
       "#import": [
         "fedora.25",
@@ -337,6 +361,12 @@
         "fedora"
       ]
     },
+    "fedora.26-arm64": {
+      "#import": [
+        "fedora.26",
+        "fedora-arm64"
+      ]
+    },
     "fedora.26-x64": {
       "#import": [
         "fedora.26",
@@ -348,6 +378,12 @@
         "fedora"
       ]
     },
+    "fedora.27-arm64": {
+      "#import": [
+        "fedora.27",
+        "fedora-arm64"
+      ]
+    },
     "fedora.27-x64": {
       "#import": [
         "fedora.27",
@@ -359,6 +395,12 @@
         "fedora"
       ]
     },
+    "fedora.28-arm64": {
+      "#import": [
+        "fedora.28",
+        "fedora-arm64"
+      ]
+    },
     "fedora.28-x64": {
       "#import": [
         "fedora.28",
@@ -370,6 +412,12 @@
         "fedora"
       ]
     },
+    "fedora.29-arm64": {
+      "#import": [
+        "fedora.29",
+        "fedora-arm64"
+      ]
+    },
     "fedora.29-x64": {
       "#import": [
         "fedora.29",
@@ -381,6 +429,12 @@
         "fedora"
       ]
     },
+    "fedora.30-arm64": {
+      "#import": [
+        "fedora.30",
+        "fedora-arm64"
+      ]
+    },
     "fedora.30-x64": {
       "#import": [
         "fedora.30",
@@ -392,6 +446,12 @@
         "fedora"
       ]
     },
+    "fedora.31-arm64": {
+      "#import": [
+        "fedora.31",
+        "fedora-arm64"
+      ]
+    },
     "fedora.31-x64": {
       "#import": [
         "fedora.31",
@@ -966,6 +1026,12 @@
         "linux"
       ]
     },
+    "rhel-arm64": {
+      "#import": [
+        "rhel",
+        "linux-arm64"
+      ]
+    },
     "rhel-x64": {
       "#import": [
         "rhel",
@@ -1076,6 +1142,12 @@
         "rhel"
       ]
     },
+    "rhel.8-arm64": {
+      "#import": [
+        "rhel.8",
+        "rhel-arm64"
+      ]
+    },
     "rhel.8-x64": {
       "#import": [
         "rhel.8",
@@ -1087,6 +1159,12 @@
         "rhel.8"
       ]
     },
+    "rhel.8.0-arm64": {
+      "#import": [
+        "rhel.8.0",
+        "rhel.8-arm64"
+      ]
+    },
     "rhel.8.0-x64": {
       "#import": [
         "rhel.8.0",
@@ -1098,6 +1176,12 @@
         "rhel.8.0"
       ]
     },
+    "rhel.8.1-arm64": {
+      "#import": [
+        "rhel.8.1",
+        "rhel.8.0-arm64"
+      ]
+    },
     "rhel.8.1-x64": {
       "#import": [
         "rhel.8.1",
diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
index e326ccd..5567506 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
@@ -41,7 +41,7 @@
 
     <RuntimeGroup Include="fedora">
       <Parent>linux</Parent>
-      <Architectures>x64</Architectures>
+      <Architectures>x64;arm64</Architectures>
       <Versions>23;24;25;26;27;28;29;30;31</Versions>
       <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
     </RuntimeGroup>
@@ -115,7 +115,7 @@
     </RuntimeGroup>
     <RuntimeGroup Include="rhel">
       <Parent>linux</Parent>
-      <Architectures>x64</Architectures>
+      <Architectures>x64;arm64</Architectures>
       <Versions>8;8.0;8.1</Versions>
     </RuntimeGroup>