From fe647068e60075751266fc9fe4ce55519e22856d Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Sat, 12 Mar 2022 05:44:22 +0800 Subject: [PATCH 1/2] update to dotnet3.1-3.1.417-1.el8_5 Signed-off-by: Liwei Ge --- 0001-dotnet-anolis-add-distro.patch | 189 ---------------------------- dotnet3.1.spec | 35 +++--- download | 2 +- 3 files changed, 16 insertions(+), 210 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 d88ca3c..0000000 --- a/0001-dotnet-anolis-add-distro.patch +++ /dev/null @@ -1,189 +0,0 @@ -From e3b75db36656ffc3ea6cd488d078f3fddb0798ed Mon Sep 17 00:00:00 2001 -From: Liwei Ge -Date: Wed, 23 Jun 2021 16:11:45 +0800 -Subject: [PATCH] dotnet anolis add distro - ---- - repos/core-setup.common.targets | 3 ++ - .../runtime.compatibility.json | 48 ++++++++++++++++++- - .../runtimeGroups.props | 10 +++- - 3 files changed, 59 insertions(+), 2 deletions(-) - -diff --git a/repos/core-setup.common.targets b/repos/core-setup.common.targets -index 81c6ecebd..3110be658 100644 ---- a/repos/core-setup.common.targets -+++ b/repos/core-setup.common.targets -@@ -38,6 +38,9 @@ - -+ - - - -diff --git a/src/corefx.93bbacb3437ddb3b5a45ea269ea049d64b5825ec/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/src/corefx.93bbacb3437ddb3b5a45ea269ea049d64b5825ec/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json -index 382ee4552..0277f97b0 100644 ---- a/src/corefx.93bbacb3437ddb3b5a45ea269ea049d64b5825ec/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json -+++ b/src/corefx.93bbacb3437ddb3b5a45ea269ea049d64b5825ec/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json -@@ -547,6 +547,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 --git a/src/corefx.93bbacb3437ddb3b5a45ea269ea049d64b5825ec/pkg/Microsoft.NETCore.Platforms/runtime.json b/src/corefx.93bbacb3437ddb3b5a45ea269ea049d64b5825ec/pkg/Microsoft.NETCore.Platforms/runtime.json -index 382ee4552..0277f97b0 100644 ---- a/src/corefx.93bbacb3437ddb3b5a45ea269ea049d64b5825ec/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-12-11 06:54:19.000000000 +0800 -+++ b/src/corefx.93bbacb3437ddb3b5a45ea269ea049d64b5825ec/pkg/Microsoft.NETCore.Platforms/runtime.json 2022-02-28 23:54:04.700075540 +0800 -@@ -227,6 +227,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/src/corefx.93bbacb3437ddb3b5a45ea269ea049d64b5825ec/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/src/corefx.93bbacb3437ddb3b5a45ea269ea049d64b5825ec/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props -index faa697f34..82ee1d5a4 100644 ---- a/src/corefx.93bbacb3437ddb3b5a45ea269ea049d64b5825ec/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props -+++ b/src/corefx.93bbacb3437ddb3b5a45ea269ea049d64b5825ec/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props -@@ -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" /> - - --- -2.18.4 - diff --git a/dotnet3.1.spec b/dotnet3.1.spec index 15023d5..b330410 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.22 -%global runtime_version 3.1.22 +%global host_version 3.1.23 +%global runtime_version 3.1.23 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 3.1.416 +%global sdk_version 3.1.417 %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: 3%{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/ @@ -88,8 +86,6 @@ Patch300: core-setup-do-not-strip.patch Patch500: cli-telemetry-optout.patch -Patch1000: 0001-dotnet-anolis-add-distro.patch - ExclusiveArch: x86_64 BuildRequires: clang @@ -343,33 +339,31 @@ ln -s %{_libdir}/dotnet/reference-packages/Private.SourceBuild.ReferencePackages %endif # Fix bad hardcoded path in build -sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/core-setup.*/src/corehost/common/pal.unix.cpp +sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/dotnet-core-setup.*/src/corehost/common/pal.unix.cpp # Disable warnings sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.common.props %patch1 -p1 -pushd src/corefx.* +pushd src/dotnet-corefx.* %patch100 -p1 %patch103 -p1 popd -pushd src/coreclr.* +pushd src/dotnet-coreclr.* %patch200 -p1 #%%patch201 -p1 popd -pushd src/core-setup.* +pushd src/dotnet-core-setup.* %patch300 -p1 popd -pushd src/cli.* +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 @@ -446,11 +440,11 @@ chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{run # Provided by dotnet-host from another SRPM #install -dm 0755 %%{buildroot}/%%{_datadir}/bash-completion/completions # dynamic completion needs the file to be named the same as the base command -#install src/cli.*/scripts/register-completions.bash %%{buildroot}/%%{_datadir}/bash-completion/completions/dotnet +#install src/dotnet-cli.*/scripts/register-completions.bash %%{buildroot}/%%{_datadir}/bash-completion/completions/dotnet # TODO: the zsh completion script needs to be ported to use #compdef #install -dm 755 %%{buildroot}/%%{_datadir}/zsh/site-functions -#install src/cli/scripts/register-completions.zsh %%{buildroot}/%%{_datadir}/zsh/site-functions/_dotnet +#install src/dotnet-cli/scripts/register-completions.zsh %%{buildroot}/%%{_datadir}/zsh/site-functions/_dotnet # Provided by dotnet-host from another SRPM #install -dm 0755 %%{buildroot}%%{_bindir} @@ -513,8 +507,9 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 %{_libdir}/dotnet/source-built-artifacts %changelog -* Thu Feb 24 2022 Weitao Zhou - 3.1.416-3.0.1 -- Add anolis distro info(Liwei Ge) +* Fri Mar 04 2022 Omair Majid - 3.1.417-1 +- Update to .NET SDK 3.1.417 and Runtime 3.1.23 +- Resolves: RHBZ#2060567 * Tue Jan 25 2022 Omair Majid - 3.1.416-3 - Disable bootstrap diff --git a/download b/download index 0c6ed7f..907b918 100644 --- a/download +++ b/download @@ -1 +1 @@ -2680c20d8f940a04f21979f672410354 dotnet-v3.1.416-SDK.tar.gz +90a62ba0fbd083bd2f912f54ae361285 dotnet-v3.1.417-SDK.tar.gz -- Gitee From 67e405141b050ea8719f58f1cacbd6472d1ce49b 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 | 189 ++++++++++++++++++++++++++++ dotnet3.1.spec | 13 +- 2 files changed, 200 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..a543cc3 --- /dev/null +++ b/0001-dotnet-anolis-add-distro.patch @@ -0,0 +1,189 @@ +From e3b75db36656ffc3ea6cd488d078f3fddb0798ed Mon Sep 17 00:00:00 2001 +From: Liwei Ge +Date: Wed, 23 Jun 2021 16:11:45 +0800 +Subject: [PATCH] dotnet anolis add distro + +--- + repos/core-setup.common.targets | 3 ++ + .../runtime.compatibility.json | 48 ++++++++++++++++++- + .../runtimeGroups.props | 10 +++- + 3 files changed, 59 insertions(+), 2 deletions(-) + +diff --git a/repos/core-setup.common.targets b/repos/core-setup.common.targets +index 81c6ecebd..3110be658 100644 +--- a/repos/core-setup.common.targets ++++ b/repos/core-setup.common.targets +@@ -38,6 +38,9 @@ + ++ + + + +diff --git a/src/dotnet-corefx.641ee87bc17bd8307682c4677c10e0eb33906c0d/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/src/dotnet-corefx.641ee87bc17bd8307682c4677c10e0eb33906c0d/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json +index 382ee4552..0277f97b0 100644 +--- a/src/dotnet-corefx.641ee87bc17bd8307682c4677c10e0eb33906c0d/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json ++++ b/src/dotnet-corefx.641ee87bc17bd8307682c4677c10e0eb33906c0d/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json +@@ -547,6 +547,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 --git a/src/dotnet-corefx.641ee87bc17bd8307682c4677c10e0eb33906c0d/pkg/Microsoft.NETCore.Platforms/runtime.json b/src/dotnet-corefx.641ee87bc17bd8307682c4677c10e0eb33906c0d/pkg/Microsoft.NETCore.Platforms/runtime.json +index 382ee4552..0277f97b0 100644 +--- a/src/dotnet-corefx.641ee87bc17bd8307682c4677c10e0eb33906c0d/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-12-11 06:54:19.000000000 +0800 ++++ b/src/dotnet-corefx.641ee87bc17bd8307682c4677c10e0eb33906c0d/pkg/Microsoft.NETCore.Platforms/runtime.json 2022-02-28 23:54:04.700075540 +0800 +@@ -227,6 +227,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/src/dotnet-corefx.641ee87bc17bd8307682c4677c10e0eb33906c0d/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/src/dotnet-corefx.641ee87bc17bd8307682c4677c10e0eb33906c0d/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props +index faa697f34..82ee1d5a4 100644 +--- a/src/dotnet-corefx.641ee87bc17bd8307682c4677c10e0eb33906c0d/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props ++++ b/src/dotnet-corefx.641ee87bc17bd8307682c4677c10e0eb33906c0d/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props +@@ -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" /> + + +-- +2.18.4 + diff --git a/dotnet3.1.spec b/dotnet3.1.spec index b330410..d0251e7 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/ @@ -86,6 +88,8 @@ Patch300: core-setup-do-not-strip.patch Patch500: cli-telemetry-optout.patch +Patch1000: 0001-dotnet-anolis-add-distro.patch + ExclusiveArch: x86_64 BuildRequires: clang @@ -364,6 +368,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 @@ -507,6 +513,9 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 %{_libdir}/dotnet/source-built-artifacts %changelog +* Sat Mar 12 2022 Liwei Ge - 3.1.417-1.0.1 +- Add anolis distro info(Liwei Ge) + * Fri Mar 04 2022 Omair Majid - 3.1.417-1 - Update to .NET SDK 3.1.417 and Runtime 3.1.23 - Resolves: RHBZ#2060567 -- Gitee