diff --git a/0001-dotnet-anolis-add-distro.patch b/0001-dotnet-anolis-add-distro.patch
new file mode 100644
index 0000000000000000000000000000000000000000..48cfd329d6c4529cdb5b460e88fb3df8066c9891
--- /dev/null
+++ b/0001-dotnet-anolis-add-distro.patch
@@ -0,0 +1,171 @@
+diff -Nurw dotnet-v3.1.424-SDK-bak/repos/core-setup.common.targets dotnet-v3.1.424-SDK/repos/core-setup.common.targets
+--- dotnet-v3.1.424-SDK-bak/repos/core-setup.common.targets 2022-06-30 12:53:32.000000000 -0400
++++ dotnet-v3.1.424-SDK/repos/core-setup.common.targets 2022-07-29 02:58:33.098782259 -0400
+@@ -38,6 +38,9 @@
+
++
+
+
+
+diff -Nurw dotnet-v3.1.424-SDK-bak/src/dotnet-corefx.729859d96f98ad3f36d030b1868875f15bb5632c/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json dotnet-v3.1.424-SDK/src/dotnet-corefx.729859d96f98ad3f36d030b1868875f15bb5632c/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+--- dotnet-v3.1.424-SDK-bak/src/dotnet-corefx.729859d96f98ad3f36d030b1868875f15bb5632c/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2022-06-30 14:33:13.000000000 -0400
++++ dotnet-v3.1.424-SDK/src/dotnet-corefx.729859d96f98ad3f36d030b1868875f15bb5632c/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2022-07-29 03:10:13.824095412 -0400
+@@ -650,6 +650,80 @@
+ "any",
+ "base"
+ ],
++ "anolis": [
++ "anolis",
++ "rhel",
++ "linux",
++ "unix",
++ "any",
++ "base"
++ ],
++ "anolis-arm64": [
++ "anolis-arm64",
++ "anolis",
++ "rhel-arm64",
++ "rhel",
++ "linux-arm64",
++ "linux",
++ "unix-arm64",
++ "unix",
++ "any",
++ "base"
++ ],
++ "anolis-x64": [
++ "anolis-x64",
++ "anolis",
++ "rhel-x64",
++ "rhel",
++ "linux-x64",
++ "linux",
++ "unix-x64",
++ "unix",
++ "any",
++ "base"
++ ],
++ "anolis.8": [
++ "anolis.8",
++ "anolis",
++ "rhel.8",
++ "rhel",
++ "linux",
++ "unix",
++ "any",
++ "base"
++ ],
++ "anolis.8-arm64": [
++ "anolis.8-arm64",
++ "anolis.8",
++ "anolis-arm64",
++ "rhel.8-arm64",
++ "anolis",
++ "rhel.8",
++ "rhel-arm64",
++ "rhel",
++ "linux-arm64",
++ "linux",
++ "unix-arm64",
++ "unix",
++ "any",
++ "base"
++ ],
++ "anolis.8-x64": [
++ "anolis.8-x64",
++ "anolis.8",
++ "anolis-x64",
++ "rhel.8-x64",
++ "anolis",
++ "rhel.8",
++ "rhel-x64",
++ "rhel",
++ "linux-x64",
++ "linux",
++ "unix-x64",
++ "unix",
++ "any",
++ "base"
++ ],
+ "debian": [
+ "debian",
+ "linux",
+diff -Nurw dotnet-v3.1.424-SDK-bak/src/dotnet-corefx.729859d96f98ad3f36d030b1868875f15bb5632c/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props dotnet-v3.1.424-SDK/src/dotnet-corefx.729859d96f98ad3f36d030b1868875f15bb5632c/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+--- dotnet-v3.1.424-SDK-bak/src/dotnet-corefx.729859d96f98ad3f36d030b1868875f15bb5632c/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2022-06-30 14:33:13.000000000 -0400
++++ dotnet-v3.1.424-SDK/src/dotnet-corefx.729859d96f98ad3f36d030b1868875f15bb5632c/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2022-07-29 03:17:32.883277529 -0400
+@@ -40,6 +40,14 @@
+ false
+
+
++
++ rhel
++ x64;arm64
++ 8
++ true
++ false
++
++
+
+ linux
+ x64;x86;arm;armel;arm64
+@@ -193,6 +201,6 @@
+ RuntimeJson="runtime.json"
+ CompatibilityMap="runtime.compatibility.json"
+ RuntimeDirectedGraph="$(PackageReportDir)$(Id)$(NuspecSuffix)-runtime.json.dgml"
+- UpdateRuntimeFiles="$(UpdateRuntimeFiles)" />
++ UpdateRuntimeFiles="true" />
+
+
+diff -Nurw dotnet-v3.1.424-SDK-bak/src/dotnet-corefx.729859d96f98ad3f36d030b1868875f15bb5632c/pkg/Microsoft.NETCore.Platforms/runtime.json dotnet-v3.1.424-SDK/src/dotnet-corefx.729859d96f98ad3f36d030b1868875f15bb5632c/pkg/Microsoft.NETCore.Platforms/runtime.json
+--- dotnet-v3.1.424-SDK-bak/src/dotnet-corefx.729859d96f98ad3f36d030b1868875f15bb5632c/pkg/Microsoft.NETCore.Platforms/runtime.json 2022-06-30 14:33:13.000000000 -0400
++++ dotnet-v3.1.424-SDK/src/dotnet-corefx.729859d96f98ad3f36d030b1868875f15bb5632c/pkg/Microsoft.NETCore.Platforms/runtime.json 2022-07-29 03:20:26.382373685 -0400
+@@ -249,6 +249,44 @@
+ "rhel.9-x64"
+ ]
+ },
++ "anolis": {
++ "#import": [
++ "rhel"
++ ]
++ },
++ "anolis-arm64": {
++ "#import": [
++ "anolis",
++ "rhel-arm64"
++ ]
++ },
++ "anolis-x64": {
++ "#import": [
++ "anolis",
++ "rhel-x64"
++ ]
++ },
++ "anolis.8": {
++ "#import": [
++ "anolis",
++ "rhel.8"
++ ]
++ },
++ "anolis.8-arm64": {
++ "#import": [
++ "anolis.8",
++ "anolis-arm64",
++ "rhel.8-arm64"
++ ]
++ },
++
++ "anolis.8-x64": {
++ "#import": [
++ "anolis.8",
++ "anolis-x64",
++ "rhel.8-x64"
++ ]
++ },
+ "debian": {
+ "#import": [
+ "linux"
diff --git a/dotnet3.1.spec b/dotnet3.1.spec
index f1e6ceb8b11f211c3cb2570f80b6f20e9ed48da9..b698da61ab7f4644c9d3f04022318e8777f487d6 100644
--- a/dotnet3.1.spec
+++ b/dotnet3.1.spec
@@ -1,3 +1,5 @@
+%define anolis_os_version %(source /etc/os-release; echo ${VERSION})
+%define anolis_release .0.1
%bcond_with bootstrap
# Avoid provides/requires from private libraries
@@ -55,13 +57,13 @@
%if 0%{?centos}
%global runtime_id centos.%{centos}-%{runtime_arch}
%else
-%global runtime_id rhel.%{rhel}-%{runtime_arch}
+%global runtime_id anolis.%{anolis_os_version}-%{runtime_arch}
%endif
%endif
Name: dotnet3.1
Version: %{sdk_rpm_version}
-Release: 1%{?dist}
+Release: 1%{anolis_release}%{?dist}
Summary: .NET Core CLI tools and runtime
License: MIT and ASL 2.0 and BSD
URL: https://github.com/dotnet/
@@ -87,6 +89,8 @@ Patch301: core-setup-no-werror.patch
Patch500: cli-telemetry-optout.patch
+Patch1000: 0001-dotnet-anolis-add-distro.patch
+
ExclusiveArch: x86_64
BuildRequires: clang
@@ -368,6 +372,8 @@ pushd src/dotnet-cli.*
%patch500 -p1
popd
+%patch1000 -p1
+
# If CLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE is misisng, add it back
grep CLR_CMAKE_USE_SYSTEM_LIBUNWIND repos/coreclr.common.props || \
sed -i 's|\$(BuildArguments) |$(BuildArguments) cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' repos/coreclr.common.props
@@ -511,6 +517,9 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
%{_libdir}/dotnet/source-built-artifacts
%changelog
+*Thu Oct 13 2022 Liwei Ge - 3.1.424-1.0.1
+- Add anolis distro info(Liwei Ge)
+
* Mon Oct 03 2022 Omair Majid - 3.1.424-1
- Update to .NET SDK 3.1.424 and Runtime 3.1.30
- Resolves: RHBZ#2131728