From 166097b1ebdbfe1a2df852a953a8ea1a7681d77f Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sat, 26 Feb 2022 04:21:06 +0000 Subject: [PATCH] import dotnet6.0-6.0.102-2.el8 --- .dotnet6.0.metadata | 2 +- .gitignore | 2 +- .../installer-12622-fix-runtime-symbols.patch | 48 ------------ SOURCES/runtime-61442-disable-werror.patch | 41 ---------- SOURCES/runtime-62170-clang13.patch | 76 ------------------- SPECS/dotnet6.0.spec | 38 +++------- 6 files changed, 14 insertions(+), 193 deletions(-) delete mode 100644 SOURCES/installer-12622-fix-runtime-symbols.patch delete mode 100644 SOURCES/runtime-61442-disable-werror.patch delete mode 100644 SOURCES/runtime-62170-clang13.patch diff --git a/.dotnet6.0.metadata b/.dotnet6.0.metadata index c6b8af0..4db4fcf 100644 --- a/.dotnet6.0.metadata +++ b/.dotnet6.0.metadata @@ -1 +1 @@ -4521a07f53136d83916b1a044ed6cba3b8a41813 SOURCES/dotnet-9e8b04bbff820c93c142f99a507a46b976f5c14c.tar.gz +f2c1dc7dad1af4b9f6f48b507cad4042446af0a0 SOURCES/dotnet-v6.0.102-SDK.tar.gz diff --git a/.gitignore b/.gitignore index faa0263..0f67fc4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-9e8b04bbff820c93c142f99a507a46b976f5c14c.tar.gz +SOURCES/dotnet-v6.0.102-SDK.tar.gz diff --git a/SOURCES/installer-12622-fix-runtime-symbols.patch b/SOURCES/installer-12622-fix-runtime-symbols.patch deleted file mode 100644 index fa2d46f..0000000 --- a/SOURCES/installer-12622-fix-runtime-symbols.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 7365824ddc6ed66152cfc50f4c8508368953099c Mon Sep 17 00:00:00 2001 -From: Omair Majid -Date: Tue, 9 Nov 2021 08:39:27 -0500 -Subject: [PATCH] Also publish non-portable RID runtime symbols tarball - -This fixes a regression in .NET 6 source-build compared to the .NET -5 source-build. - -source-build wants to publish runtime symbols tarball for portable (eg, -linux-x64) and non-portable (eg, fedora.33-x64) RIDs here after a build. -Following .NET 5 conventions, I expected to see: - - ./artifacts/x64/Release/runtime/dotnet-runtime-symbols-fedora.34-x64-6.0.0.tar.gz - ./artifacts/x64/Release/runtime/dotnet-runtime-symbols-linux-x64-6.0.0.tar.gz - -Unfortunately, only the portable RID (linux-x64) tarball is present -after a full source-build in .NET 6. - -It turns out this is a bug in our build scripts. We try and copy -binaries - including the symbol tarballs - after building each of -runtime-portable and runtime. However, the target dependency is wrong: -after `Build`, the intermediate package doesn't exist from the -just-built repo. - -What ends up happening is that nothing is copied after building -runtime-portable. However, after building runtime, the runtime-portable -intermediate artifacts are found and copied over. So the end -build has portable RID symbos, but not the non-portable ones. - -Fix that by changing the dependency of this target so it runs after -intermediate packages are available. ---- - src/SourceBuild/tarball/content/repos/runtime.common.targets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/SourceBuild/tarball/content/repos/runtime.common.targets b/src/SourceBuild/tarball/content/repos/runtime.common.targets -index ca606b23d21..862b70dc832 100644 ---- a/src/SourceBuild/tarball/content/repos/runtime.common.targets -+++ b/src/SourceBuild/tarball/content/repos/runtime.common.targets -@@ -23,7 +23,7 @@ - - - - diff --git a/SOURCES/runtime-61442-disable-werror.patch b/SOURCES/runtime-61442-disable-werror.patch deleted file mode 100644 index 401440c..0000000 --- a/SOURCES/runtime-61442-disable-werror.patch +++ /dev/null @@ -1,41 +0,0 @@ -From f41c06ba040adf1930156340c5b03d9864d8a1d4 Mon Sep 17 00:00:00 2001 -From: Omair Majid -Date: Wed, 10 Nov 2021 17:54:45 -0500 -Subject: [PATCH] The 6.0 branch is no longer pre-release - -This has limited affects, but it should have been set to false since 6.0 -is now stable/released. - -The one difference it makes is that -Werror is disabled when building -native code. ---- - Directory.Build.props | 2 +- - eng/native/configureplatform.cmake | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index f19ea9208c2c..5cb87bb7c257 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -255,7 +255,7 @@ - https://go.microsoft.com/fwlink/?LinkID=799421 - - -- true -+ false - $(MSBuildProjectName.Contains('Private')) - - true -diff --git a/eng/native/configureplatform.cmake b/eng/native/configureplatform.cmake -index 519431772004..af1c88bce5b6 100644 ---- a/eng/native/configureplatform.cmake -+++ b/eng/native/configureplatform.cmake -@@ -2,7 +2,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/functions.cmake) - - # If set, indicates that this is not an officially supported release - # Keep in sync with IsPrerelease in Directory.Build.props --set(PRERELEASE 1) -+set(PRERELEASE 0) - - #---------------------------------------- - # Detect and set platform variable names diff --git a/SOURCES/runtime-62170-clang13.patch b/SOURCES/runtime-62170-clang13.patch deleted file mode 100644 index 8c47186..0000000 --- a/SOURCES/runtime-62170-clang13.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 9cd95a5608b667e22727d9eb1a5330efd61dfe50 Mon Sep 17 00:00:00 2001 -From: Jan Vorlicek -Date: Mon, 29 Nov 2021 17:32:45 -0800 -Subject: [PATCH] Fix clang 13 induced runtime issues - -The clang 13 optimizer started to assume that "this" pointer is always -properly aligned. That lead to elimination of some code that was actually -needed. -It also takes pointer aliasing rules more strictly in one place in jit. -That caused the optimizer to falsely assume that a callee with an argument -passed by reference is not modifying that argument and used a stale -copy of the original value at the caller site. - -This change fixes both of the issues. With this fix, runtime compiled -using clang 13 seems to be fully functional. ---- - src/coreclr/inc/corhlpr.h | 8 ++++---- - src/coreclr/jit/bitsetasshortlong.h | 4 ++-- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/coreclr/inc/corhlpr.h b/src/coreclr/inc/corhlpr.h -index 450514da95c1..427e8cdc0ff5 100644 ---- a/src/coreclr/inc/corhlpr.h -+++ b/src/coreclr/inc/corhlpr.h -@@ -336,7 +336,7 @@ struct COR_ILMETHOD_SECT - const COR_ILMETHOD_SECT* Next() const - { - if (!More()) return(0); -- return ((COR_ILMETHOD_SECT*)(((BYTE *)this) + DataSize()))->Align(); -+ return ((COR_ILMETHOD_SECT*)Align(((BYTE *)this) + DataSize())); - } - - const BYTE* Data() const -@@ -374,9 +374,9 @@ struct COR_ILMETHOD_SECT - return((AsSmall()->Kind & CorILMethod_Sect_FatFormat) != 0); - } - -- const COR_ILMETHOD_SECT* Align() const -+ static const void* Align(const void* p) - { -- return((COR_ILMETHOD_SECT*) ((((UINT_PTR) this) + 3) & ~3)); -+ return((void*) ((((UINT_PTR) p) + 3) & ~3)); - } - - protected: -@@ -579,7 +579,7 @@ typedef struct tagCOR_ILMETHOD_FAT : IMAGE_COR_ILMETHOD_FAT - - const COR_ILMETHOD_SECT* GetSect() const { - if (!More()) return (0); -- return(((COR_ILMETHOD_SECT*) (GetCode() + GetCodeSize()))->Align()); -+ return(((COR_ILMETHOD_SECT*) COR_ILMETHOD_SECT::Align(GetCode() + GetCodeSize()))); - } - } COR_ILMETHOD_FAT; - -diff --git a/src/coreclr/jit/bitsetasshortlong.h b/src/coreclr/jit/bitsetasshortlong.h -index d343edeeda4c..365cf346a10a 100644 ---- a/src/coreclr/jit/bitsetasshortlong.h -+++ b/src/coreclr/jit/bitsetasshortlong.h -@@ -345,7 +345,7 @@ class BitSetOps= 8 ExclusiveArch: aarch64 x86_64 s390x @@ -401,8 +394,6 @@ sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime.*/src/native/corehos pushd src/runtime.* %patch100 -p1 %patch101 -p1 -%patch102 -p1 -%patch103 -p1 popd pushd src/fsharp.* @@ -442,16 +433,6 @@ pushd src/installer.* %patch1600 -p1 popd -# We need to apply the patch to the already-built tarball's -# repos/runtime.common.targets, not to the installer's "source" copy. -%patch1601 -p5 - - -# Disable package validation which breaks our build, even though we -# are injecting "blessed" nuget packages produced by Microsoft. -# There's no need to run validation in RPM packages anyway. -# See https://github.com/dotnet/runtime/pull/60881 -sed -i -E 's|( /p:BuildDebPackage=false)|\1 /p:EnablePackageValidation=false|' src/runtime.*/eng/SourceBuild.props %if ! %{use_bundled_libunwind} sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' src/runtime.*/eng/SourceBuild.props @@ -634,6 +615,11 @@ install -m 0644 artifacts/%{runtime_arch}/Release/Private.SourceBuilt.Artifacts. %changelog +* Thu Feb 17 2022 Omair Majid - 6.0.102-1 +- Update to .NET SDK 6.0.102 and Runtime 6.0.2 +- Resolves: RHBZ#2030390 +- Resolves: RHBZ#2048256 + * Fri Dec 10 2021 Omair Majid - 6.0.100-1 - Fix build against clang 13 - Resolves: RHBZ#2003061