fix RID bootstrap, do it once

This commit is contained in:
slava86 2021-03-19 20:26:49 +03:00
parent 392391352f
commit d37b0b31b1
2 changed files with 30 additions and 0 deletions

View file

@ -0,0 +1,23 @@
--- a/sdk/3.1.112/RuntimeIdentifierGraph.json 2021-03-13 22:54:54.385414703 +0300
+++ b/sdk/3.1.112/RuntimeIdentifierGraph.json 2021-03-13 22:56:49.227808138 +0300
@@ -1,5 +1,20 @@
{
"runtimes": {
+ "rosa.2019.1": {
+ "#import": [
+ "linux"
+ ]
+ },
+ "rosa.2019.1-arm64": {
+ "#import": [
+ "linux-arm64"
+ ]
+ },
+ "rosa.2019.1-x64": {
+ "#import": [
+ "linux-x64"
+ ]
+ },
"alpine": {
"#import": [
"linux-musl"

View file

@ -96,6 +96,8 @@ Patch301: core-setup-gcc11.patch
# Disable telemetry by default; make it opt-in
Patch500: cli-telemetry-optout.patch
# fix RID bootstrap, do it once
Patch501: RuntimeIdentifierGraph-Rosa.patch
ExclusiveArch: aarch64 x86_64
@ -403,7 +405,12 @@ cat /etc/os-release
%if %{without bootstrap}
# We need to create a copy because we will mutate this
cp -a %{_libdir}/dotnet previously-built-dotnet
%if 1
pushd previously-built-dotnet
patch -p1 < %{P:501}
popd
%endif
%endif
%if 0%{?fedora} > 32 || 0%{?rhel} > 8
# Setting this macro ensures that only clang supported options will be