0001-Add-Rocky-Linux-specific-changes.patch 12.5 KB
Newer Older
1
2
3
diff -Naurp dotnet-v5.0.208-SDK-orig/src/dotnet-installer.cd07fb054b734018bf72d3bbc44c8e7bafd6e920/src/core-sdk-tasks/Enumerations/BuildPlatform.cs dotnet-v5.0.208-SDK/src/dotnet-installer.cd07fb054b734018bf72d3bbc44c8e7bafd6e920/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
--- dotnet-v5.0.208-SDK-orig/src/dotnet-installer.cd07fb054b734018bf72d3bbc44c8e7bafd6e920/src/core-sdk-tasks/Enumerations/BuildPlatform.cs	2021-08-04 08:29:39.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-installer.cd07fb054b734018bf72d3bbc44c8e7bafd6e920/src/core-sdk-tasks/Enumerations/BuildPlatform.cs	2021-08-12 10:15:24.807635250 -0700
4
@@ -15,6 +15,7 @@ namespace Microsoft.DotNet.Cli.Build.Fra
5
6
7
8
9
10
11
12
         Debian = 8,
         Fedora = 9,
         OpenSuse = 10,
-        FreeBSD = 11
+        FreeBSD = 11,
+        Rocky = 12,
     }
 }
13
14
15
diff -Naurp dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/installer/Directory.Build.props dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/installer/Directory.Build.props
--- dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/installer/Directory.Build.props	2021-08-04 08:28:51.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/installer/Directory.Build.props	2021-08-12 10:18:08.764751358 -0700
16
17
18
19
20
21
22
23
@@ -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>
24
@@ -252,6 +253,13 @@
25
26
27
28
29
30
31
32
33
34
35
36
37
         <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>
38
@@ -333,7 +341,7 @@
39
40
41
     <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>
42
-    <InstallerExtension Condition="'$(TargetsRhel)' == 'true' or '$(TargetsCentos)' == 'true' or '$(TargetsOpensuse)' == 'true' or '$(TargetsFedora)' == 'true' or '$(TargetsOracle)' == 'true' or '$(TargetsSles)' == 'true' or '$(TargetsCblMariner)' == 'true' or '$(HostMachineRidTargetsRpmPackages)' == 'true'">.rpm</InstallerExtension>
43
+    <InstallerExtension Condition="'$(TargetsRhel)' == 'true' or '$(TargetsCentos)' == 'true' or '$(TargetsRocky)' == 'true' or '$(TargetsOpensuse)' == 'true' or '$(TargetsFedora)' == 'true' or '$(TargetsOracle)' == 'true' or '$(TargetsSles)' == 'true' or '$(TargetsCblMariner)' == 'true' or '$(HostMachineRidTargetsRpmPackages)' == 'true'">.rpm</InstallerExtension>
44
45
46
     <CombinedInstallerExtension Condition="'$(TargetOS)' == 'Windows_NT'">.exe</CombinedInstallerExtension>
     <CombinedInstallerExtension Condition="'$(TargetOS)' != 'Windows_NT'">$(InstallerExtension)</CombinedInstallerExtension>
   </PropertyGroup>
47
48
49
diff -Naurp dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
--- dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json	2021-08-04 08:28:56.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json	2021-08-12 10:26:35.614295177 -0700
50
@@ -4601,6 +4601,122 @@
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
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
     "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"
+  ],
170
171
   "sles": [
     "sles",
172
     "linux",
173
@@ -7032,4 +7148,4 @@
174
175
176
177
178
179
     "any",
     "base"
   ]
-}
\ No newline at end of file
+}
180
181
182
diff -Naurp dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
--- dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props	2021-08-04 08:28:56.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props	2021-08-12 10:25:53.522751516 -0700
183
@@ -50,6 +50,14 @@
184
185
186
187
188
189
       <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
     </RuntimeGroup>
 
+    <RuntimeGroup Include="rocky">
+      <Parent>rhel</Parent>
+      <Architectures>x64;arm64</Architectures>
190
+      <Versions>8;9</Versions>
191
192
193
194
195
196
197
+      <ApplyVersionsToParent>true</ApplyVersionsToParent>
+      <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
+    </RuntimeGroup>
+
     <RuntimeGroup Include="debian">
       <Parent>linux</Parent>
       <Architectures>x64;x86;arm;armel;arm64</Architectures>
198
199
200
diff -Naurp dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
--- dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json	2021-08-04 08:28:56.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json	2021-08-12 10:25:18.274296239 -0700
201
202
@@ -1955,6 +1955,63 @@
         "rhel-x64"
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
260
261
       ]
     },
+    "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"
+      ]
+    },
262
     "sles": {
263
264
       "#import": [
         "linux"
265
@@ -3121,4 +3178,4 @@
266
267
268
269
270
271
       ]
     }
   }
-}
\ No newline at end of file
+}
272
273
274
diff -Naurp dotnet-v5.0.208-SDK-orig/src/dotnet-sdk.25b3161b802eae78d7a306cf404da7af1762e222/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs dotnet-v5.0.208-SDK/src/dotnet-sdk.25b3161b802eae78d7a306cf404da7af1762e222/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs
--- dotnet-v5.0.208-SDK-orig/src/dotnet-sdk.25b3161b802eae78d7a306cf404da7af1762e222/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs	2021-08-04 08:29:23.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-sdk.25b3161b802eae78d7a306cf404da7af1762e222/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs	2021-08-12 10:23:13.657686667 -0700
275
@@ -15,6 +15,7 @@ namespace Microsoft.DotNet.Cli.Build.Fra
276
277
278
279
280
281
282
283
         Debian = 8,
         Fedora = 9,
         OpenSuse = 10,
-        FreeBSD = 11
+        FreeBSD = 11,
+        Rocky = 12,
     }
 }
284
285
286
diff -Naurp dotnet-v5.0.208-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json dotnet-v5.0.208-SDK/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json
--- dotnet-v5.0.208-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json	2021-08-04 08:29:21.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json	2021-08-12 10:22:44.973316243 -0700
287
@@ -332,6 +332,13 @@
288
289
             "#import": [ "centos.7", "centos-x64", "rhel.7-x64" ]
         },
290
 
291
292
293
294
295
296
+        "rocky": {
+            "#import": [ "rhel" ]
+        },
+        "rocky-x64": {
+            "#import": [ "rocky", "rhel-x64" ]
+        },
297
+
298
299
         "debian": {
             "#import": [ "linux" ]
300
301
         },
@@ -778,6 +785,13 @@
302
303
             "#import": [ "centos.7-corert", "centos-x64-corert", "centos.7-x64" ]
         },
304
 
305
306
307
308
309
310
+        "rocky-corert": {
+            "#import": [ "rel-corert", "rocky" ]
+        },
+        "rocky-x64-corert": {
+            "#import": [ "rocky-corert", "rhel-x64-corert", "rocky-x64" ]
+        },
311
+
312
313
         "debian-corert": {
             "#import": [ "linux-corert", "debian" ]
314
         },
315
316
317
diff -Naurp dotnet-v5.0.208-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json dotnet-v5.0.208-SDK/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json
--- dotnet-v5.0.208-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json	2021-08-04 08:29:21.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json	2021-08-12 10:21:59.116724394 -0700
318
@@ -332,6 +332,13 @@
319
320
       "#import": [ "centos.7", "centos-x64", "rhel.7-x64" ]
     },
321
 
322
323
324
325
326
327
+    "rocky": {
+      "#import": [ "rhel" ]
+    },
+    "rocky-x64": {
+      "#import": [ "rocky", "rhel-x64" ]
+    },
328
+
329
330
     "debian": {
       "#import": [ "linux" ]
331
332
     },
@@ -778,6 +785,13 @@
333
334
       "#import": [ "centos.7-corert", "centos-x64-corert", "centos.7-x64" ]
     },
335
 
336
337
338
339
340
341
+    "rocky-corert": {
+      "#import": [ "rel-corert", "rocky" ]
+    },
+    "rocky-x64-corert": {
+      "#import": [ "rocky-corert", "rhel-x64-corert", "rocky-x64" ]
+    },
342
+
343
344
     "debian-corert": {
       "#import": [ "linux-corert", "debian" ]
345
     },