0001-Add-Rocky-Linux-specific-changes.patch 14.4 KB
Newer Older
1
2
3
4
5
6
7
8
9
10
11
12
diff -Naurp dotnet-v5.0.208-SDK-orig/src/diagnostics.47296ca69bb66180c132f3b16667f904dfc7c6c7/eng/init-distro-rid.sh dotnet-v5.0.208-SDK/src/diagnostics.47296ca69bb66180c132f3b16667f904dfc7c6c7/eng/init-distro-rid.sh
--- dotnet-v5.0.208-SDK-orig/src/diagnostics.47296ca69bb66180c132f3b16667f904dfc7c6c7/eng/init-distro-rid.sh	2021-10-01 19:10:09.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/diagnostics.47296ca69bb66180c132f3b16667f904dfc7c6c7/eng/init-distro-rid.sh	2021-11-09 21:24:09.611947326 -0700
@@ -51,7 +51,7 @@ initNonPortableDistroRid()
             # We have forced __PortableBuild=0. This is because -portablebuld
             # has been passed as false.
             if (( ${isPortable} == 0 )); then
-                if [ "${ID}" == "rhel" ]; then
+                if [ "${ID}" == "rhel" ] || [ "${ID}" == "rocky" ]; then
                     # remove the last version digit	
                     VERSION_ID=${VERSION_ID%.*}
                 fi
13
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
14
15
--- dotnet-v5.0.208-SDK-orig/src/dotnet-installer.cd07fb054b734018bf72d3bbc44c8e7bafd6e920/src/core-sdk-tasks/Enumerations/BuildPlatform.cs	2021-10-01 19:10:09.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-installer.cd07fb054b734018bf72d3bbc44c8e7bafd6e920/src/core-sdk-tasks/Enumerations/BuildPlatform.cs	2021-11-09 21:16:48.652728503 -0700
16
@@ -15,6 +15,7 @@ namespace Microsoft.DotNet.Cli.Build.Fra
17
18
19
20
21
         Debian = 8,
         Fedora = 9,
         OpenSuse = 10,
-        FreeBSD = 11
+        FreeBSD = 11,
22
+        Rocky = 12
23
24
     }
 }
25
26
27
28
29
30
31
32
33
34
35
36
diff -Naurp dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/eng/native/init-distro-rid.sh dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/eng/native/init-distro-rid.sh
--- dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/eng/native/init-distro-rid.sh	2021-10-01 19:09:13.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/eng/native/init-distro-rid.sh	2021-11-09 21:25:55.908276917 -0700
@@ -41,7 +41,7 @@ initNonPortableDistroRid()
             # We have forced __PortableBuild=0. This is because -portablebuld
             # has been passed as false.
             if (( isPortable == 0 )); then
-                if [ "${ID}" = "rhel" ]; then
+                if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ]; then
                     # remove the last version digit
                     VERSION_ID="${VERSION_ID%.*}"
                 fi
37
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
38
39
--- dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/installer/Directory.Build.props	2021-10-01 19:09:15.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/installer/Directory.Build.props	2021-11-09 21:18:59.614902511 -0700
40
41
42
43
44
45
46
47
@@ -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>
48
@@ -252,6 +253,13 @@
49
50
51
52
53
54
55
56
57
58
59
60
61
         <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>
62
@@ -333,7 +341,7 @@
63
64
65
     <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>
66
-    <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>
67
+    <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>
68
69
70
     <CombinedInstallerExtension Condition="'$(TargetOS)' == 'Windows_NT'">.exe</CombinedInstallerExtension>
     <CombinedInstallerExtension Condition="'$(TargetOS)' != 'Windows_NT'">$(InstallerExtension)</CombinedInstallerExtension>
   </PropertyGroup>
71
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
72
73
74
--- dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json	2021-10-01 19:09:21.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json	2021-11-09 21:19:53.785560861 -0700
@@ -4808,6 +4808,122 @@
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
192
193
     "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"
+  ],
194
195
   "sles": [
     "sles",
196
     "linux",
197
@@ -7239,4 +7355,4 @@
198
199
200
201
202
203
     "any",
     "base"
   ]
-}
\ No newline at end of file
+}
204
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
205
206
--- dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props	2021-10-01 19:09:21.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props	2021-11-09 21:20:23.297374727 -0700
207
@@ -50,6 +50,14 @@
208
209
210
211
212
213
       <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
     </RuntimeGroup>
 
+    <RuntimeGroup Include="rocky">
+      <Parent>rhel</Parent>
+      <Architectures>x64;arm64</Architectures>
214
+      <Versions>8;9</Versions>
215
216
217
218
219
220
221
+      <ApplyVersionsToParent>true</ApplyVersionsToParent>
+      <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
+    </RuntimeGroup>
+
     <RuntimeGroup Include="debian">
       <Parent>linux</Parent>
       <Architectures>x64;x86;arm;armel;arm64</Architectures>
222
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
223
224
225
--- dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json	2021-10-01 19:09:21.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json	2021-11-09 21:20:50.427203615 -0700
@@ -2030,6 +2030,63 @@
226
         "rhel-x64"
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
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
       ]
     },
+    "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"
+      ]
+    },
286
     "sles": {
287
288
       "#import": [
         "linux"
289
@@ -3196,4 +3253,4 @@
290
291
292
293
294
295
       ]
     }
   }
-}
\ No newline at end of file
+}
296
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
297
298
--- dotnet-v5.0.208-SDK-orig/src/dotnet-sdk.25b3161b802eae78d7a306cf404da7af1762e222/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs	2021-10-01 19:09:51.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-sdk.25b3161b802eae78d7a306cf404da7af1762e222/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs	2021-11-09 21:21:19.532020044 -0700
299
@@ -15,6 +15,7 @@ namespace Microsoft.DotNet.Cli.Build.Fra
300
301
302
303
304
         Debian = 8,
         Fedora = 9,
         OpenSuse = 10,
-        FreeBSD = 11
+        FreeBSD = 11,
305
+        Rocky = 12
306
307
     }
 }
308
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
309
310
--- dotnet-v5.0.208-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json	2021-10-01 19:09:49.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json	2021-11-09 21:21:53.244807413 -0700
311
@@ -332,6 +332,13 @@
312
313
             "#import": [ "centos.7", "centos-x64", "rhel.7-x64" ]
         },
314
 
315
316
317
318
319
320
+        "rocky": {
+            "#import": [ "rhel" ]
+        },
+        "rocky-x64": {
+            "#import": [ "rocky", "rhel-x64" ]
+        },
321
+
322
323
         "debian": {
             "#import": [ "linux" ]
324
325
         },
@@ -778,6 +785,13 @@
326
327
             "#import": [ "centos.7-corert", "centos-x64-corert", "centos.7-x64" ]
         },
328
 
329
330
331
332
333
334
+        "rocky-corert": {
+            "#import": [ "rel-corert", "rocky" ]
+        },
+        "rocky-x64-corert": {
+            "#import": [ "rocky-corert", "rhel-x64-corert", "rocky-x64" ]
+        },
335
+
336
337
         "debian-corert": {
             "#import": [ "linux-corert", "debian" ]
338
         },
339
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
340
341
--- dotnet-v5.0.208-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json	2021-10-01 19:09:49.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json	2021-11-09 21:22:33.409554095 -0700
342
@@ -332,6 +332,13 @@
343
344
       "#import": [ "centos.7", "centos-x64", "rhel.7-x64" ]
     },
345
 
346
347
348
349
350
351
+    "rocky": {
+      "#import": [ "rhel" ]
+    },
+    "rocky-x64": {
+      "#import": [ "rocky", "rhel-x64" ]
+    },
352
+
353
354
     "debian": {
       "#import": [ "linux" ]
355
356
     },
@@ -778,6 +785,13 @@
357
358
       "#import": [ "centos.7-corert", "centos-x64-corert", "centos.7-x64" ]
     },
359
 
360
361
362
363
364
365
+    "rocky-corert": {
+      "#import": [ "rel-corert", "rocky" ]
+    },
+    "rocky-x64-corert": {
+      "#import": [ "rocky-corert", "rhel-x64-corert", "rocky-x64" ]
+    },
366
+
367
368
     "debian-corert": {
       "#import": [ "linux-corert", "debian" ]
369
     },