0001-Add-Rocky-Linux-specific-changes.patch 12.1 KB
Newer Older
1
From d8abd02c77b21d5f9eda40515d513c2b8ce83380 Mon Sep 17 00:00:00 2001
2
From: Mustafa Gezen <mustafa@rockylinux.org>
3
Date: Mon, 14 Jun 2021 14:45:50 +0200
4
5
6
7
8
Subject: [PATCH] Add Rocky Linux specific changes

---
 .../Enumerations/BuildPlatform.cs             |   3 +-
 .../src/installer/Directory.Build.props       |  10 +-
9
10
11
 .../runtime.compatibility.json                | 116 ++++++++++++++++++
 .../Microsoft.NETCore.Platforms/runtime.json  |  57 +++++++++
 .../runtimeGroups.props                       |   8 ++
12
 .../Enumerations/BuildPlatform.cs             |   3 +-
13
14
15
 .../compiler/resources/runtime.json           |  14 +++
 .../compiler/resources/runtime.json           |  14 +++
 8 files changed, 222 insertions(+), 3 deletions(-)
16
17
18
19
20
21

diff --git a/src/dotnet-installer.84d1fe1bb7a65f28ca55d2f85b3b024ff3ddaa9e/src/core-sdk-tasks/Enumerations/BuildPlatform.cs b/src/dotnet-installer.84d1fe1bb7a65f28ca55d2f85b3b024ff3ddaa9e/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
index 72e68a0dc..d861d57b7 100644
--- a/src/dotnet-installer.84d1fe1bb7a65f28ca55d2f85b3b024ff3ddaa9e/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
+++ b/src/dotnet-installer.84d1fe1bb7a65f28ca55d2f85b3b024ff3ddaa9e/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
@@ -15,6 +15,7 @@ public enum BuildPlatform
22
23
24
25
26
27
28
29
         Debian = 8,
         Fedora = 9,
         OpenSuse = 10,
-        FreeBSD = 11
+        FreeBSD = 11,
+        Rocky = 12,
     }
 }
30
31
32
33
diff --git a/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/installer/Directory.Build.props b/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/installer/Directory.Build.props
index 9c82b3bc2..7197feafd 100644
--- a/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/installer/Directory.Build.props
+++ b/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/installer/Directory.Build.props
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
@@ -172,6 +172,7 @@
     <TargetsOpensuse>false</TargetsOpensuse>
     <TargetsFedora>false</TargetsFedora>
     <TargetsCentos>false</TargetsCentos>
+    <TargetsRocky>false</TargetsRocky>
     <TargetsOracle>false</TargetsOracle>
     <TargetsSles>false</TargetsSles>
     <TargetsBrowser>false</TargetsBrowser>
@@ -251,6 +252,13 @@
         <TargetsUnix>true</TargetsUnix>
       </PropertyGroup>
     </When>
+    <When Condition="$(OutputRid.StartsWith('rocky'))">
+      <PropertyGroup>
+        <TargetsRocky>true</TargetsRocky>
+        <TargetsLinux>true</TargetsLinux>
+        <TargetsUnix>true</TargetsUnix>
+      </PropertyGroup>
+    </When>
     <When Condition="$(OutputRid.StartsWith('opensuse'))">
       <PropertyGroup>
         <TargetsOpensuse>true</TargetsOpensuse>
@@ -325,7 +333,7 @@
     <InstallerExtension Condition="'$(TargetOS)' == 'Windows_NT'">.msi</InstallerExtension>
     <InstallerExtension Condition="'$(TargetOS)' == 'OSX'">.pkg</InstallerExtension>
     <InstallerExtension Condition="'$(TargetsDebian)' == 'true' or '$(TargetsUbuntu)' == 'true' or '$(TargetsLinuxMint)' == 'true' or '$(HostMachineRidTargetsDebianPackages)' == 'true'">.deb</InstallerExtension>
-    <InstallerExtension Condition="'$(TargetsRhel)' == 'true' or '$(TargetsCentos)' == 'true' or '$(TargetsOpensuse)' == 'true' or '$(TargetsFedora)' == 'true' or '$(TargetsOracle)' == 'true' or '$(TargetsSles)' == 'true' or '$(HostMachineRidTargetsRpmPackages)' == 'true'">.rpm</InstallerExtension>
+    <InstallerExtension Condition="'$(TargetsRhel)' == 'true' or '$(TargetsCentos)' == 'true' or '$(TargetsRocky)' == 'true' or '$(TargetsOpensuse)' == 'true' or '$(TargetsFedora)' == 'true' or '$(TargetsOracle)' == 'true' or '$(TargetsSles)' == 'true' or '$(HostMachineRidTargetsRpmPackages)' == 'true'">.rpm</InstallerExtension>
     <CombinedInstallerExtension Condition="'$(TargetOS)' == 'Windows_NT'">.exe</CombinedInstallerExtension>
     <CombinedInstallerExtension Condition="'$(TargetOS)' != 'Windows_NT'">$(InstallerExtension)</CombinedInstallerExtension>
   </PropertyGroup>
65
diff --git a/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
66
index f56d7461e..fbca5ca1c 100644
67
68
--- a/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+++ b/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
69
@@ -1704,6 +1704,122 @@
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
     "any",
     "base"
   ],
+  "rocky": [
+    "rocky",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rocky-arm64": [
+    "rocky-arm64",
+    "rocky",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rocky-x64": [
+    "rocky-x64",
+    "rocky",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rocky.8": [
+    "rocky.8",
+    "rocky",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rocky.8-arm64": [
+    "rocky.8-arm64",
+    "rocky.8",
+    "rocky-arm64",
+    "rhel.8-arm64",
+    "rocky",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rocky.8-x64": [
+    "rocky.8-x64",
+    "rocky.8",
+    "rocky-x64",
+    "rhel.8-x64",
+    "rocky",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rocky.9": [
+    "rocky.9",
+    "rocky",
+    "rhel.9",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rocky.9-arm64": [
+    "rocky.9-arm64",
+    "rocky.9",
+    "rocky-arm64",
+    "rhel.9-arm64",
+    "rocky",
+    "rhel.9",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rocky.9-x64": [
+    "rocky.9-x64",
+    "rocky.9",
+    "rocky-x64",
+    "rhel.9-x64",
+    "rocky",
+    "rhel.9",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
   "debian": [
     "debian",
     "linux",
192
diff --git a/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json b/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
193
index 3e8b2e74e..953760a29 100644
194
195
--- a/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
+++ b/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
196
@@ -601,6 +601,63 @@
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
         "rhel.9-x64"
       ]
     },
+    "rocky": {
+      "#import": [
+        "rhel"
+      ]
+    },
+    "rocky-arm64": {
+      "#import": [
+        "rocky",
+        "rhel-arm64"
+      ]
+    },
+    "rocky-x64": {
+      "#import": [
+        "rocky",
+        "rhel-x64"
+      ]
+    },
+    "rocky.8": {
+      "#import": [
+        "rocky",
+        "rhel.8"
+      ]
+    },
+    "rocky.8-arm64": {
+      "#import": [
+        "rocky.8",
+        "rocky-arm64",
+        "rhel.8-arm64"
+      ]
+    },
+    "rocky.8-x64": {
+      "#import": [
+        "rocky.8",
+        "rocky-x64",
+        "rhel.8-x64"
+      ]
+    },
+    "rocky.9": {
+      "#import": [
+        "rocky",
+        "rhel.9"
+      ]
+    },
+    "rocky.9-arm64": {
+      "#import": [
+        "rocky.9",
+        "rocky-arm64",
+        "rhel.9-arm64"
+      ]
+    },
+    "rocky.9-x64": {
+      "#import": [
+        "rocky.9",
+        "rocky-x64",
+        "rhel.9-x64"
+      ]
+    },
     "debian": {
       "#import": [
         "linux"
260
diff --git a/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
261
index e78268c07..33afd7f79 100644
262
263
--- a/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+++ b/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
264
@@ -49,6 +49,14 @@
265
266
267
268
269
270
271
       <ApplyVersionsToParent>true</ApplyVersionsToParent>
       <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
     </RuntimeGroup>
+    
+    <RuntimeGroup Include="rocky">
+      <Parent>rhel</Parent>
+      <Architectures>x64;arm64</Architectures>
272
+      <Versions>8;9</Versions>
273
274
275
276
277
278
279
280
281
282
283
+      <ApplyVersionsToParent>true</ApplyVersionsToParent>
+      <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
+    </RuntimeGroup>
 
     <RuntimeGroup Include="debian">
       <Parent>linux</Parent>
diff --git a/src/dotnet-sdk.b4ddf0facd49caab999e4accd6cb82d5e599bf5e/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs b/src/dotnet-sdk.b4ddf0facd49caab999e4accd6cb82d5e599bf5e/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs
index 72e68a0dc..d861d57b7 100644
--- a/src/dotnet-sdk.b4ddf0facd49caab999e4accd6cb82d5e599bf5e/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs
+++ b/src/dotnet-sdk.b4ddf0facd49caab999e4accd6cb82d5e599bf5e/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs
@@ -15,6 +15,7 @@ public enum BuildPlatform
284
285
286
287
288
289
290
291
         Debian = 8,
         Fedora = 9,
         OpenSuse = 10,
-        FreeBSD = 11
+        FreeBSD = 11,
+        Rocky = 12,
     }
 }
292
diff --git a/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json b/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json
293
index a90e2ca80..5dd6baa81 100644
294
295
--- a/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json
+++ b/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json
296
@@ -331,6 +331,13 @@
297
         "centos.7-x64": {
298
299
             "#import": [ "centos.7", "centos-x64", "rhel.7-x64" ]
         },
300
+        
301
302
303
304
305
306
+        "rocky": {
+            "#import": [ "rhel" ]
+        },
+        "rocky-x64": {
+            "#import": [ "rocky", "rhel-x64" ]
+        },
307
 
308
309
         "debian": {
             "#import": [ "linux" ]
310
@@ -777,6 +784,13 @@
311
         "centos.7-x64-corert": {
312
313
             "#import": [ "centos.7-corert", "centos-x64-corert", "centos.7-x64" ]
         },
314
+        
315
316
317
318
319
320
+        "rocky-corert": {
+            "#import": [ "rel-corert", "rocky" ]
+        },
+        "rocky-x64-corert": {
+            "#import": [ "rocky-corert", "rhel-x64-corert", "rocky-x64" ]
+        },
321
 
322
323
         "debian-corert": {
             "#import": [ "linux-corert", "debian" ]
324
diff --git a/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json b/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json
325
index 03f159a9e..fb645df5e 100644
326
327
--- a/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json
+++ b/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json
328
@@ -331,6 +331,13 @@
329
     "centos.7-x64": {
330
331
       "#import": [ "centos.7", "centos-x64", "rhel.7-x64" ]
     },
332
+    
333
334
335
336
337
338
+    "rocky": {
+      "#import": [ "rhel" ]
+    },
+    "rocky-x64": {
+      "#import": [ "rocky", "rhel-x64" ]
+    },
339
 
340
341
     "debian": {
       "#import": [ "linux" ]
342
@@ -777,6 +784,13 @@
343
     "centos.7-x64-corert": {
344
345
       "#import": [ "centos.7-corert", "centos-x64-corert", "centos.7-x64" ]
     },
346
+    
347
348
349
350
351
352
+    "rocky-corert": {
+      "#import": [ "rel-corert", "rocky" ]
+    },
+    "rocky-x64-corert": {
+      "#import": [ "rocky-corert", "rhel-x64-corert", "rocky-x64" ]
+    },
353
 
354
355
     "debian-corert": {
       "#import": [ "linux-corert", "debian" ]
356
357
358
-- 
2.24.3 (Apple Git-128)