From 72a086ab71226bde0db25d477326e4d2ec8b3102 Mon Sep 17 00:00:00 2001 From: hongwei-qin Date: Thu, 16 Jun 2022 14:53:20 +0800 Subject: [PATCH 1/2] update to dotnet6.0-6.0.106-1.el8_6 Signed-off-by: hongwei-qin --- 2000-anolis-dotnet-add-distro.patch | 102 ---------------------------- dotnet6.0.spec | 40 +++++++---- download | 2 +- 3 files changed, 29 insertions(+), 115 deletions(-) delete mode 100644 2000-anolis-dotnet-add-distro.patch diff --git a/2000-anolis-dotnet-add-distro.patch b/2000-anolis-dotnet-add-distro.patch deleted file mode 100644 index 8da3bd9..0000000 --- a/2000-anolis-dotnet-add-distro.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- ./src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props 2021-10-03 23:24:08.000000000 +0800 -+++ ./src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props.new 2022-02-12 20:37:51.705404475 +0800 -@@ -55,6 +55,14 @@ - true - false - -+ -+ rhel -+ x64;arm64 -+ 8;9 -+ true -+ false -+ -+ - - - linux -@@ -278,6 +286,6 @@ - RuntimeJson="runtime.json" - CompatibilityMap="runtime.compatibility.json" - RuntimeDirectedGraph="$(OutputPath)runtime.json.dgml" -- UpdateRuntimeFiles="$(UpdateRuntimeFiles)" /> -+ UpdateRuntimeFiles="true" /> - - ---- ./src/diagnostics/eng/init-distro-rid.sh 2022-05-03 01:47:58.000000000 +0800 -+++ ./src/diagnostics/eng/init-distro-rid.sh.new 2022-06-09 16:13:49.331928410 +0800 -@@ -51,7 +51,7 @@ - # 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}" = "anolis" ]; then - # remove the last version digit - VERSION_ID=${VERSION_ID%.*} - fi ---- ./src/runtime/eng/native/init-distro-rid.sh 2022-05-03 01:46:20.000000000 +0800 -+++ ./src/runtime/eng/native/init-distro-rid.sh.new 2022-06-09 16:17:38.476897600 +0800 -@@ -41,7 +41,7 @@ - # 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}" = "anolis" ]; then - # remove the last version digit - VERSION_ID="${VERSION_ID%.*}" - fi ---- ./src/deployment-tools/eng/native/init-distro-rid.sh 2022-06-09 16:26:06.117555652 +0800 -+++ ./src/deployment-tools/eng/native/init-distro-rid.sh.new 2022-06-09 16:25:45.862850985 +0800 -@@ -41,7 +41,7 @@ - # 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}" = "anolis" ]; then - # remove the last version digit - VERSION_ID="${VERSION_ID%.*}" - fi ---- ./src/sdk/src/Cli/Microsoft.DotNet.Cli.Utils/RuntimeEnvironment.cs 2022-05-03 01:46:49.000000000 +0800 -+++ ./src/sdk/src/Cli/Microsoft.DotNet.Cli.Utils/RuntimeEnvironment.cs.new 2022-06-09 16:30:22.790485373 +0800 -@@ -220,7 +220,7 @@ - lastVersionNumberSeparatorIndex = distroInfo.VersionId.IndexOf('.', lastVersionNumberSeparatorIndex + 1); - } - -- if (lastVersionNumberSeparatorIndex != -1 && (distroInfo.Id == "rhel" || distroInfo.Id == "alpine")) -+ if (lastVersionNumberSeparatorIndex != -1 && (distroInfo.Id == "rhel" || distroInfo.Id == "alpine" || distroInfo.Id == "anolis")) - { - distroInfo.VersionId = distroInfo.VersionId.Substring(0, lastVersionNumberSeparatorIndex); - } ---- ./src/runtime/src/native/corehost/hostmisc/pal.unix.cpp 2022-05-03 01:46:23.000000000 +0800 -+++ ./src/runtime/src/native/corehost/hostmisc/pal.unix.cpp.new 2022-06-09 16:32:39.621245751 +0800 -@@ -679,6 +679,7 @@ - pal::string_t normalize_linux_rid(pal::string_t rid) - { - pal::string_t rhelPrefix(_X("rhel.")); -+ pal::string_t anolisPrefix(_X("anolis.")); - pal::string_t alpinePrefix(_X("alpine.")); - size_t lastVersionSeparatorIndex = std::string::npos; - -@@ -686,6 +687,10 @@ - { - lastVersionSeparatorIndex = rid.find(_X("."), rhelPrefix.length()); - } -+ else if (rid.compare(0, anolisPrefix.length(), anolisPrefix) == 0) -+ { -+ lastVersionSeparatorIndex = rid.find(_X("."), anolisPrefix.length()); -+ } - else if (rid.compare(0, alpinePrefix.length(), alpinePrefix) == 0) - { - size_t secondVersionSeparatorIndex = rid.find(_X("."), alpinePrefix.length()); -cs ./src/arcade/src/Microsoft.DotNet.XUnitConsoleRunner/src/common/AssemblyResolution/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs.new ---- ./src/arcade/src/Microsoft.DotNet.XUnitConsoleRunner/src/common/AssemblyResolution/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs 2022-05-03 01:48:00.000000000 +0800 -+++ ./src/arcade/src/Microsoft.DotNet.XUnitConsoleRunner/src/common/AssemblyResolution/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs.new 2022-06-09 20:41:37.231172301 +0800 -@@ -131,7 +131,7 @@ - // Handle if VersionId is null by just setting the index to -1. - int minorVersionNumberSeparatorIndex = distroInfo.VersionId?.IndexOf('.') ?? -1; - -- if (distroInfo.Id == "rhel" && minorVersionNumberSeparatorIndex != -1) -+ if ((distroInfo.Id == "rhel" || distroInfo.Id == "anolis") && minorVersionNumberSeparatorIndex != -1) - { - distroInfo.VersionId = distroInfo.VersionId.Substring(0, minorVersionNumberSeparatorIndex); - } diff --git a/dotnet6.0.spec b/dotnet6.0.spec index f3875d6..5220937 100644 --- a/dotnet6.0.spec +++ b/dotnet6.0.spec @@ -1,6 +1,4 @@ %bcond_with bootstrap -%define anolis_os_version %(source /etc/os-release; echo ${VERSION}) -%define anolis_release .0.1 # Avoid provides/requires from private libraries %global privlibs libhostfxr @@ -22,10 +20,10 @@ # until that's done, disable LTO. This has to happen before setting the flags below. %define _lto_cflags %{nil} -%global host_version 6.0.5 -%global runtime_version 6.0.5 +%global host_version 6.0.6 +%global runtime_version 6.0.6 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 6.0.105 +%global sdk_version 6.0.106 %global sdk_feature_band_version %(echo %{sdk_version} | sed -e 's|[[:digit:]][[:digit:]]$|00|') %global templates_version %{runtime_version} #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') @@ -62,7 +60,7 @@ Name: dotnet6.0 Version: %{sdk_rpm_version} -Release: 1%{anolis_release}%{?dist} +Release: 1%{?dist} Summary: .NET Runtime and SDK License: MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib URL: https://github.com/dotnet/ @@ -92,8 +90,19 @@ Patch101: runtime-mono-remove-ilstrip.patch # https://github.com/dotnet/runtime/pull/66594 Patch102: runtime-66594-s390x-debuginfo.patch +# https://github.com/dotnet/command-line-api/pull/1401 +Patch300: command-line-api-use-work-tree-with-git-apply.patch + +# https://github.com/microsoft/vstest/pull/3046 +Patch400: vstest-use-work-tree-with-git-apply.patch + +# This is the suggestion from https://github.com/dotnet/source-build/pull/2450, applied +Patch500: fsharp-use-work-tree-with-git-apply.patch # Disable apphost, needed for s390x -Patch500: fsharp-no-apphost.patch +Patch501: fsharp-no-apphost.patch + +# This is the suggestion from https://github.com/dotnet/source-build/pull/2450, applied +Patch600: xliff-tasks-use-work-tree-with-git-apply.patch # Disable apphost, needed for s390x Patch700: arcade-no-apphost.patch @@ -121,8 +130,6 @@ Patch1501: sdk-22373-portablerid.patch # https://github.com/dotnet/installer/pull/12516 Patch1600: installer-12516-portablerid.patch -Patch2000: 2000-anolis-dotnet-add-distro.patch - %if 0%{?fedora} || 0%{?rhel} >= 8 ExclusiveArch: aarch64 x86_64 s390x %else @@ -406,8 +413,17 @@ pushd src/runtime %patch102 -p1 popd +pushd src/command-line-api +%patch300 -p1 +popd + +pushd src/vstest +%patch400 -p1 +popd + pushd src/fsharp %patch500 -p1 +%patch501 -p1 popd pushd src/arcade @@ -443,7 +459,6 @@ pushd src/installer %patch1600 -p1 popd -%patch2000 -p0 %if ! %{use_bundled_libunwind} sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' src/runtime/eng/SourceBuild.props @@ -631,8 +646,9 @@ echo "Testing build results for debug symbols..." %changelog -* Mon May 30 2022 Liwei Ge - 6.0.105-1.0.1 -- Fix sdk suffix for Anolis OS +* Mon Jun 06 2022 Omair Majid - 6.0.106-1 +- Update to .NET SDK 6.0.106 and Runtime 6.0.6 +- Resolves: RHBZ#2093432 * Thu May 05 2022 Omair Majid - 6.0.105-1 - Update to .NET SDK 6.0.105 and Runtime 6.0.5 diff --git a/download b/download index 9c26c70..4f94f66 100644 --- a/download +++ b/download @@ -1 +1 @@ -06302b75e2d001c775f6260779b0d4a6 dotnet-v6.0.105-SDK.tar.gz +77de22012ebe4fac932407e5b1c178ae dotnet-v6.0.106-SDK.tar.gz -- Gitee From 81d856ce0733570177256a5de11c376b784ffcb6 Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Mon, 14 Feb 2022 22:05:33 +0800 Subject: [PATCH 2/2] build: fix sdk suffix for Anolis OS also add RID for anolis Signed-off-by: Liwei Ge --- 2000-anolis-dotnet-add-distro.patch | 102 ++++++++++++++++++++++++++++ dotnet6.0.spec | 10 ++- 2 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 2000-anolis-dotnet-add-distro.patch diff --git a/2000-anolis-dotnet-add-distro.patch b/2000-anolis-dotnet-add-distro.patch new file mode 100644 index 0000000..8da3bd9 --- /dev/null +++ b/2000-anolis-dotnet-add-distro.patch @@ -0,0 +1,102 @@ +--- ./src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props 2021-10-03 23:24:08.000000000 +0800 ++++ ./src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props.new 2022-02-12 20:37:51.705404475 +0800 +@@ -55,6 +55,14 @@ + true + false + ++ ++ rhel ++ x64;arm64 ++ 8;9 ++ true ++ false ++ ++ + + + linux +@@ -278,6 +286,6 @@ + RuntimeJson="runtime.json" + CompatibilityMap="runtime.compatibility.json" + RuntimeDirectedGraph="$(OutputPath)runtime.json.dgml" +- UpdateRuntimeFiles="$(UpdateRuntimeFiles)" /> ++ UpdateRuntimeFiles="true" /> + + +--- ./src/diagnostics/eng/init-distro-rid.sh 2022-05-03 01:47:58.000000000 +0800 ++++ ./src/diagnostics/eng/init-distro-rid.sh.new 2022-06-09 16:13:49.331928410 +0800 +@@ -51,7 +51,7 @@ + # 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}" = "anolis" ]; then + # remove the last version digit + VERSION_ID=${VERSION_ID%.*} + fi +--- ./src/runtime/eng/native/init-distro-rid.sh 2022-05-03 01:46:20.000000000 +0800 ++++ ./src/runtime/eng/native/init-distro-rid.sh.new 2022-06-09 16:17:38.476897600 +0800 +@@ -41,7 +41,7 @@ + # 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}" = "anolis" ]; then + # remove the last version digit + VERSION_ID="${VERSION_ID%.*}" + fi +--- ./src/deployment-tools/eng/native/init-distro-rid.sh 2022-06-09 16:26:06.117555652 +0800 ++++ ./src/deployment-tools/eng/native/init-distro-rid.sh.new 2022-06-09 16:25:45.862850985 +0800 +@@ -41,7 +41,7 @@ + # 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}" = "anolis" ]; then + # remove the last version digit + VERSION_ID="${VERSION_ID%.*}" + fi +--- ./src/sdk/src/Cli/Microsoft.DotNet.Cli.Utils/RuntimeEnvironment.cs 2022-05-03 01:46:49.000000000 +0800 ++++ ./src/sdk/src/Cli/Microsoft.DotNet.Cli.Utils/RuntimeEnvironment.cs.new 2022-06-09 16:30:22.790485373 +0800 +@@ -220,7 +220,7 @@ + lastVersionNumberSeparatorIndex = distroInfo.VersionId.IndexOf('.', lastVersionNumberSeparatorIndex + 1); + } + +- if (lastVersionNumberSeparatorIndex != -1 && (distroInfo.Id == "rhel" || distroInfo.Id == "alpine")) ++ if (lastVersionNumberSeparatorIndex != -1 && (distroInfo.Id == "rhel" || distroInfo.Id == "alpine" || distroInfo.Id == "anolis")) + { + distroInfo.VersionId = distroInfo.VersionId.Substring(0, lastVersionNumberSeparatorIndex); + } +--- ./src/runtime/src/native/corehost/hostmisc/pal.unix.cpp 2022-05-03 01:46:23.000000000 +0800 ++++ ./src/runtime/src/native/corehost/hostmisc/pal.unix.cpp.new 2022-06-09 16:32:39.621245751 +0800 +@@ -679,6 +679,7 @@ + pal::string_t normalize_linux_rid(pal::string_t rid) + { + pal::string_t rhelPrefix(_X("rhel.")); ++ pal::string_t anolisPrefix(_X("anolis.")); + pal::string_t alpinePrefix(_X("alpine.")); + size_t lastVersionSeparatorIndex = std::string::npos; + +@@ -686,6 +687,10 @@ + { + lastVersionSeparatorIndex = rid.find(_X("."), rhelPrefix.length()); + } ++ else if (rid.compare(0, anolisPrefix.length(), anolisPrefix) == 0) ++ { ++ lastVersionSeparatorIndex = rid.find(_X("."), anolisPrefix.length()); ++ } + else if (rid.compare(0, alpinePrefix.length(), alpinePrefix) == 0) + { + size_t secondVersionSeparatorIndex = rid.find(_X("."), alpinePrefix.length()); +cs ./src/arcade/src/Microsoft.DotNet.XUnitConsoleRunner/src/common/AssemblyResolution/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs.new +--- ./src/arcade/src/Microsoft.DotNet.XUnitConsoleRunner/src/common/AssemblyResolution/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs 2022-05-03 01:48:00.000000000 +0800 ++++ ./src/arcade/src/Microsoft.DotNet.XUnitConsoleRunner/src/common/AssemblyResolution/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs.new 2022-06-09 20:41:37.231172301 +0800 +@@ -131,7 +131,7 @@ + // Handle if VersionId is null by just setting the index to -1. + int minorVersionNumberSeparatorIndex = distroInfo.VersionId?.IndexOf('.') ?? -1; + +- if (distroInfo.Id == "rhel" && minorVersionNumberSeparatorIndex != -1) ++ if ((distroInfo.Id == "rhel" || distroInfo.Id == "anolis") && minorVersionNumberSeparatorIndex != -1) + { + distroInfo.VersionId = distroInfo.VersionId.Substring(0, minorVersionNumberSeparatorIndex); + } diff --git a/dotnet6.0.spec b/dotnet6.0.spec index 5220937..a4244ae 100644 --- a/dotnet6.0.spec +++ b/dotnet6.0.spec @@ -1,4 +1,6 @@ %bcond_with bootstrap +%define anolis_os_version %(source /etc/os-release; echo ${VERSION}) +%define anolis_release .0.1 # Avoid provides/requires from private libraries %global privlibs libhostfxr @@ -60,7 +62,7 @@ Name: dotnet6.0 Version: %{sdk_rpm_version} -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} Summary: .NET Runtime and SDK License: MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib URL: https://github.com/dotnet/ @@ -130,6 +132,8 @@ Patch1501: sdk-22373-portablerid.patch # https://github.com/dotnet/installer/pull/12516 Patch1600: installer-12516-portablerid.patch +Patch2000: 2000-anolis-dotnet-add-distro.patch + %if 0%{?fedora} || 0%{?rhel} >= 8 ExclusiveArch: aarch64 x86_64 s390x %else @@ -459,6 +463,7 @@ pushd src/installer %patch1600 -p1 popd +%patch2000 -p0 %if ! %{use_bundled_libunwind} sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' src/runtime/eng/SourceBuild.props @@ -646,6 +651,9 @@ echo "Testing build results for debug symbols..." %changelog +* Thu Jun 16 2022 Liwei Ge - 6.0.106-1.0.1 +- Fix sdk suffix for Anolis OS + * Mon Jun 06 2022 Omair Majid - 6.0.106-1 - Update to .NET SDK 6.0.106 and Runtime 6.0.6 - Resolves: RHBZ#2093432 -- Gitee