From 98bf11944780ac03417853f605000cb7f34c9516 Mon Sep 17 00:00:00 2001 From: anolis-bot Date: Thu, 28 Jul 2022 18:10:07 +0800 Subject: [PATCH 1/2] update to dotnet3.1-3.1.421-1.el8_6 Signed-off-by: anolis-bot --- 0001-dotnet-anolis-add-distro.patch | 171 ---------------------------- dotnet3.1.spec | 21 ++-- download | 2 +- 3 files changed, 9 insertions(+), 185 deletions(-) delete mode 100644 0001-dotnet-anolis-add-distro.patch diff --git a/0001-dotnet-anolis-add-distro.patch b/0001-dotnet-anolis-add-distro.patch deleted file mode 100644 index eaf810e..0000000 --- a/0001-dotnet-anolis-add-distro.patch +++ /dev/null @@ -1,171 +0,0 @@ -diff -Nurw dotnet-v3.1.420-SDK/repos/core-setup.common.targets dotnet-v3.1.420.new/repos/core-setup.common.targets ---- dotnet-v3.1.420-SDK/repos/core-setup.common.targets 2022-06-13 01:18:42.000000000 -0400 -+++ dotnet-v3.1.420.new/repos/core-setup.common.targets 2022-06-17 02:12:20.823055412 -0400 -@@ -38,6 +38,9 @@ - -+ - - - -diff -Nurw dotnet-v3.1.420-SDK/src/dotnet-corefx.04944b999f540d3f1068208c351716a8954e4c2b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json dotnet-v3.1.420.new/src/dotnet-corefx.04944b999f540d3f1068208c351716a8954e4c2b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json ---- dotnet-v3.1.420-SDK/src/dotnet-corefx.04944b999f540d3f1068208c351716a8954e4c2b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2022-06-13 03:27:43.000000000 -0400 -+++ dotnet-v3.1.420.new/src/dotnet-corefx.04944b999f540d3f1068208c351716a8954e4c2b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2022-06-17 02:13:54.149028663 -0400 -@@ -651,6 +651,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.420-SDK/src/dotnet-corefx.04944b999f540d3f1068208c351716a8954e4c2b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props dotnet-v3.1.420.new/src/dotnet-corefx.04944b999f540d3f1068208c351716a8954e4c2b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props ---- dotnet-v3.1.420-SDK/src/dotnet-corefx.04944b999f540d3f1068208c351716a8954e4c2b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2022-06-13 03:27:43.000000000 -0400 -+++ dotnet-v3.1.420.new/src/dotnet-corefx.04944b999f540d3f1068208c351716a8954e4c2b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2022-06-17 02:13:54.159028553 -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.420-SDK/src/dotnet-corefx.04944b999f540d3f1068208c351716a8954e4c2b/pkg/Microsoft.NETCore.Platforms/runtime.json dotnet-v3.1.420.new/src/dotnet-corefx.04944b999f540d3f1068208c351716a8954e4c2b/pkg/Microsoft.NETCore.Platforms/runtime.json ---- dotnet-v3.1.420-SDK/src/dotnet-corefx.04944b999f540d3f1068208c351716a8954e4c2b/pkg/Microsoft.NETCore.Platforms/runtime.json 2022-06-13 03:27:43.000000000 -0400 -+++ dotnet-v3.1.420.new/src/dotnet-corefx.04944b999f540d3f1068208c351716a8954e4c2b/pkg/Microsoft.NETCore.Platforms/runtime.json 2022-06-17 02:13:54.159028553 -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 4394363..6445642 100644 --- a/dotnet3.1.spec +++ b/dotnet3.1.spec @@ -1,5 +1,3 @@ -%define anolis_os_version %(source /etc/os-release; echo ${VERSION}) -%define anolis_release .0.1 %bcond_with bootstrap # Avoid provides/requires from private libraries @@ -27,10 +25,10 @@ %endif %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g') -%global host_version 3.1.26 -%global runtime_version 3.1.26 +%global host_version 3.1.27 +%global runtime_version 3.1.27 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 3.1.420 +%global sdk_version 3.1.421 %global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') %global host_rpm_version %{host_version} @@ -57,13 +55,13 @@ %if 0%{?centos} %global runtime_id centos.%{centos}-%{runtime_arch} %else -%global runtime_id anolis.%{anolis_os_version}-%{runtime_arch} +%global runtime_id rhel.%{rhel}-%{runtime_arch} %endif %endif Name: dotnet3.1 Version: %{sdk_rpm_version} -Release: 1%{anolis_release}%{?dist} +Release: 1%{?dist} Summary: .NET Core CLI tools and runtime License: MIT and ASL 2.0 and BSD URL: https://github.com/dotnet/ @@ -89,8 +87,6 @@ Patch301: core-setup-no-werror.patch Patch500: cli-telemetry-optout.patch -Patch1000: 0001-dotnet-anolis-add-distro.patch - ExclusiveArch: x86_64 BuildRequires: clang @@ -372,8 +368,6 @@ 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 @@ -517,8 +511,9 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 %{_libdir}/dotnet/source-built-artifacts %changelog -* Mon Jun 17 2022 Liwei Ge - 3.1.420-1.0.1 -- Add anolis distro info(Liwei Ge) +* Tue Jul 05 2022 Andrew Slice - 3.1.421-1 +- Update to .NET SDK 3.1.421 and Runtime 3.1.27 +- Resolves: RHBZ#2103273 * Mon Jun 13 2022 Omair Majid - 3.1.420-1 - Update to .NET SDK 3.1.420 and Runtime 3.1.26 diff --git a/download b/download index 7950156..f527f1e 100644 --- a/download +++ b/download @@ -1 +1 @@ -d93d7c920e5d85654b548f612d3b2949 dotnet-v3.1.420-SDK.tar.gz +200d976935f2aaef9c200bcb8174f0b2 dotnet-v3.1.421-SDK.tar.gz -- Gitee From 30a63951a4e196eb9750cb5a0726c6a6696b3ce9 Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Tue, 21 Dec 2021 11:58:40 +0000 Subject: [PATCH 2/2] build: add anolis distro info Signed-off-by: ZhouWeitao --- 0001-dotnet-anolis-add-distro.patch | 171 ++++++++++++++++++++++++++++ dotnet3.1.spec | 13 ++- 2 files changed, 182 insertions(+), 2 deletions(-) create mode 100644 0001-dotnet-anolis-add-distro.patch diff --git a/0001-dotnet-anolis-add-distro.patch b/0001-dotnet-anolis-add-distro.patch new file mode 100644 index 0000000..ff3ea9b --- /dev/null +++ b/0001-dotnet-anolis-add-distro.patch @@ -0,0 +1,171 @@ +diff -Nurw dotnet-v3.1.421-SDK-bak/repos/core-setup.common.targets dotnet-v3.1.421-SDK/repos/core-setup.common.targets +--- dotnet-v3.1.421-SDK-bak/repos/core-setup.common.targets 2022-06-30 12:53:32.000000000 -0400 ++++ dotnet-v3.1.421-SDK/repos/core-setup.common.targets 2022-07-29 02:58:33.098782259 -0400 +@@ -38,6 +38,9 @@ + ++ + + + +diff -Nurw dotnet-v3.1.421-SDK-bak/src/dotnet-corefx.a0e457f26f231f3e74a795dba807890df41eb373/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json dotnet-v3.1.421-SDK/src/dotnet-corefx.a0e457f26f231f3e74a795dba807890df41eb373/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json +--- dotnet-v3.1.421-SDK-bak/src/dotnet-corefx.a0e457f26f231f3e74a795dba807890df41eb373/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2022-06-30 14:33:13.000000000 -0400 ++++ dotnet-v3.1.421-SDK/src/dotnet-corefx.a0e457f26f231f3e74a795dba807890df41eb373/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.421-SDK-bak/src/dotnet-corefx.a0e457f26f231f3e74a795dba807890df41eb373/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props dotnet-v3.1.421-SDK/src/dotnet-corefx.a0e457f26f231f3e74a795dba807890df41eb373/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props +--- dotnet-v3.1.421-SDK-bak/src/dotnet-corefx.a0e457f26f231f3e74a795dba807890df41eb373/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2022-06-30 14:33:13.000000000 -0400 ++++ dotnet-v3.1.421-SDK/src/dotnet-corefx.a0e457f26f231f3e74a795dba807890df41eb373/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.421-SDK-bak/src/dotnet-corefx.a0e457f26f231f3e74a795dba807890df41eb373/pkg/Microsoft.NETCore.Platforms/runtime.json dotnet-v3.1.421-SDK/src/dotnet-corefx.a0e457f26f231f3e74a795dba807890df41eb373/pkg/Microsoft.NETCore.Platforms/runtime.json +--- dotnet-v3.1.421-SDK-bak/src/dotnet-corefx.a0e457f26f231f3e74a795dba807890df41eb373/pkg/Microsoft.NETCore.Platforms/runtime.json 2022-06-30 14:33:13.000000000 -0400 ++++ dotnet-v3.1.421-SDK/src/dotnet-corefx.a0e457f26f231f3e74a795dba807890df41eb373/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 6445642..405e2b3 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 +* Fri Jul 29 2022 Liwei Ge - 3.1.421-1.0.1 +- Add anolis distro info(Liwei Ge) + * Tue Jul 05 2022 Andrew Slice - 3.1.421-1 - Update to .NET SDK 3.1.421 and Runtime 3.1.27 - Resolves: RHBZ#2103273 -- Gitee