mirror of
https://abf.rosa.ru/djam/dotnet6.0.git
synced 2025-02-23 06:03:00 +00:00
Imported from SRPM
This commit is contained in:
commit
77675d2023
14 changed files with 1812 additions and 0 deletions
2
.abf.yml
Normal file
2
.abf.yml
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
sources:
|
||||||
|
dotnet-v3.1.112-SDK.tar.gz: 567e024b413aabb8fe4a80c66976e0a4f10cd42f
|
136
check-debug-symbols.py
Executable file
136
check-debug-symbols.py
Executable file
|
@ -0,0 +1,136 @@
|
||||||
|
#!/usr/bin/python3
|
||||||
|
|
||||||
|
"""
|
||||||
|
Check debug symbols are present in shared object and can identify
|
||||||
|
code.
|
||||||
|
|
||||||
|
It starts scanning from a directory and recursively scans all ELF
|
||||||
|
files found in it for various symbols to ensure all debuginfo is
|
||||||
|
present and nothing has been stripped.
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
|
||||||
|
./check-debug-symbols /path/of/dir/to/scan/
|
||||||
|
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
./check-debug-symbols /usr/lib64
|
||||||
|
"""
|
||||||
|
|
||||||
|
# This technique was explained to me by Mark Wielaard (mjw).
|
||||||
|
|
||||||
|
import collections
|
||||||
|
import os
|
||||||
|
import re
|
||||||
|
import subprocess
|
||||||
|
import sys
|
||||||
|
|
||||||
|
ScanResult = collections.namedtuple('ScanResult',
|
||||||
|
'file_name debug_info debug_abbrev file_symbols gnu_debuglink')
|
||||||
|
|
||||||
|
|
||||||
|
def scan_file(file):
|
||||||
|
"Scan the provided file and return a ScanResult containing results of the scan."
|
||||||
|
|
||||||
|
# Test for .debug_* sections in the shared object. This is the main test.
|
||||||
|
# Stripped objects will not contain these.
|
||||||
|
readelf_S_result = subprocess.run(['eu-readelf', '-S', file],
|
||||||
|
stdout=subprocess.PIPE, encoding='utf-8', check=True)
|
||||||
|
has_debug_info = any(line for line in readelf_S_result.stdout.split('\n') if '] .debug_info' in line)
|
||||||
|
|
||||||
|
has_debug_abbrev = any(line for line in readelf_S_result.stdout.split('\n') if '] .debug_abbrev' in line)
|
||||||
|
|
||||||
|
# Test FILE symbols. These will most likely be removed by anyting that
|
||||||
|
# manipulates symbol tables because it's generally useless. So a nice test
|
||||||
|
# that nothing has messed with symbols.
|
||||||
|
def contains_file_symbols(line):
|
||||||
|
parts = line.split()
|
||||||
|
if len(parts) < 8:
|
||||||
|
return False
|
||||||
|
return \
|
||||||
|
parts[2] == '0' and parts[3] == 'FILE' and parts[4] == 'LOCAL' and parts[5] == 'DEFAULT' and \
|
||||||
|
parts[6] == 'ABS' and re.match(r'((.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx))?', parts[7])
|
||||||
|
|
||||||
|
readelf_s_result = subprocess.run(["eu-readelf", '-s', file],
|
||||||
|
stdout=subprocess.PIPE, encoding='utf-8', check=True)
|
||||||
|
has_file_symbols = any(line for line in readelf_s_result.stdout.split('\n') if contains_file_symbols(line))
|
||||||
|
|
||||||
|
# Test that there are no .gnu_debuglink sections pointing to another
|
||||||
|
# debuginfo file. There shouldn't be any debuginfo files, so the link makes
|
||||||
|
# no sense either.
|
||||||
|
has_gnu_debuglink = any(line for line in readelf_s_result.stdout.split('\n') if '] .gnu_debuglink' in line)
|
||||||
|
|
||||||
|
return ScanResult(file, has_debug_info, has_debug_abbrev, has_file_symbols, has_gnu_debuglink)
|
||||||
|
|
||||||
|
def is_elf(file):
|
||||||
|
result = subprocess.run(['file', file], stdout=subprocess.PIPE, encoding='utf-8', check=True)
|
||||||
|
return re.search('ELF 64-bit LSB (?:executable|shared object)', result.stdout)
|
||||||
|
|
||||||
|
def scan_file_if_sensible(file):
|
||||||
|
if is_elf(file):
|
||||||
|
# print(file)
|
||||||
|
return scan_file(file)
|
||||||
|
return None
|
||||||
|
|
||||||
|
def scan_dir(dir):
|
||||||
|
results = []
|
||||||
|
for root, _, files in os.walk(dir):
|
||||||
|
for name in files:
|
||||||
|
result = scan_file_if_sensible(os.path.join(root, name))
|
||||||
|
if result:
|
||||||
|
results.append(result)
|
||||||
|
return results
|
||||||
|
|
||||||
|
def scan(file):
|
||||||
|
file = os.path.abspath(file)
|
||||||
|
if os.path.isdir(file):
|
||||||
|
return scan_dir(file)
|
||||||
|
elif os.path.isfile(file):
|
||||||
|
return [scan_file_if_sensible(file)]
|
||||||
|
|
||||||
|
def is_bad_result(result):
|
||||||
|
return not result.debug_info or not result.debug_abbrev or not result.file_symbols or result.gnu_debuglink
|
||||||
|
|
||||||
|
def print_scan_results(results, verbose):
|
||||||
|
# print(results)
|
||||||
|
for result in results:
|
||||||
|
file_name = result.file_name
|
||||||
|
found_issue = False
|
||||||
|
if not result.debug_info:
|
||||||
|
found_issue = True
|
||||||
|
print('error: missing .debug_info section in', file_name)
|
||||||
|
if not result.debug_abbrev:
|
||||||
|
found_issue = True
|
||||||
|
print('error: missing .debug_abbrev section in', file_name)
|
||||||
|
if not result.file_symbols:
|
||||||
|
found_issue = True
|
||||||
|
print('error: missing FILE symbols in', file_name)
|
||||||
|
if result.gnu_debuglink:
|
||||||
|
found_issue = True
|
||||||
|
print('error: unexpected .gnu_debuglink section in', file_name)
|
||||||
|
if verbose and not found_issue:
|
||||||
|
print('OK: ', file_name)
|
||||||
|
|
||||||
|
def main(args):
|
||||||
|
verbose = False
|
||||||
|
files = []
|
||||||
|
for arg in args:
|
||||||
|
if arg == '--verbose' or arg == '-v':
|
||||||
|
verbose = True
|
||||||
|
else:
|
||||||
|
files.append(arg)
|
||||||
|
|
||||||
|
results = []
|
||||||
|
for file in files:
|
||||||
|
results.extend(scan(file))
|
||||||
|
|
||||||
|
print_scan_results(results, verbose)
|
||||||
|
|
||||||
|
if any(is_bad_result(result) for result in results):
|
||||||
|
return 1
|
||||||
|
return 0
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
sys.exit(main(sys.argv[1:]))
|
18
cli-telemetry-optout.patch
Normal file
18
cli-telemetry-optout.patch
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
diff --git a/src/dotnet/Program.cs b/src/dotnet/Program.cs
|
||||||
|
index de1ebb9e6..6bbf479de 100644
|
||||||
|
--- a/src/dotnet/Program.cs
|
||||||
|
+++ b/src/dotnet/Program.cs
|
||||||
|
@@ -28,6 +28,13 @@ public class Program
|
||||||
|
|
||||||
|
public static int Main(string[] args)
|
||||||
|
{
|
||||||
|
+ // opt out of telemetry by default if the env var is unset
|
||||||
|
+ string telemetryValue = Environment.GetEnvironmentVariable("DOTNET_CLI_TELEMETRY_OPTOUT");
|
||||||
|
+ if (String.IsNullOrEmpty(telemetryValue))
|
||||||
|
+ {
|
||||||
|
+ Environment.SetEnvironmentVariable("DOTNET_CLI_TELEMETRY_OPTOUT", "1");
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
DebugHelper.HandleDebugSwitch(ref args);
|
||||||
|
|
||||||
|
new MulticoreJitActivator().TryActivateMulticoreJit();
|
19
core-setup-gcc11.patch
Normal file
19
core-setup-gcc11.patch
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
diff --git a/src/corehost/cli/test/nativehost/host_context_test.cpp b/src/corehost/cli/test/nativehost/host_context_test.cpp
|
||||||
|
index e6dc9f6d8..d42c0e0f2 100644
|
||||||
|
--- a/src/corehost/cli/test/nativehost/host_context_test.cpp
|
||||||
|
+++ b/src/corehost/cli/test/nativehost/host_context_test.cpp
|
||||||
|
@@ -11,6 +11,7 @@
|
||||||
|
#include <corehost_context_contract.h>
|
||||||
|
#include "host_context_test.h"
|
||||||
|
#include <utils.h>
|
||||||
|
+#include <thread>
|
||||||
|
|
||||||
|
namespace
|
||||||
|
{
|
||||||
|
@@ -539,4 +540,4 @@ bool host_context_test::load_assembly_and_get_function_pointer(
|
||||||
|
hostfxr_exports hostfxr{ hostfxr_path };
|
||||||
|
|
||||||
|
return load_assembly_and_get_function_pointer(hostfxr, config_path, argc, argv, config_log_prefix, test_output);
|
||||||
|
-}
|
||||||
|
\ No newline at end of file
|
||||||
|
+}
|
11
core-setup-hardening-flags.patch
Normal file
11
core-setup-hardening-flags.patch
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
diff --git a/src/settings.cmake b/src/settings.cmake
|
||||||
|
--- a/src/settings.cmake
|
||||||
|
+++ b/src/settings.cmake
|
||||||
|
@@ -218,6 +218,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||||
|
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Bsymbolic-functions")
|
||||||
|
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--build-id=sha1")
|
||||||
|
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id=sha1")
|
||||||
|
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
|
||||||
|
add_compile_options(-fstack-protector-strong)
|
||||||
|
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||||
|
add_compile_options(-fstack-protector)
|
11
coreclr-hardening-flags.patch
Normal file
11
coreclr-hardening-flags.patch
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
diff --git a/src/debug/createdump/CMakeLists.txt b/src/debug/createdump/CMakeLists.txt
|
||||||
|
--- a/src/debug/createdump/CMakeLists.txt
|
||||||
|
+++ b/src/debug/createdump/CMakeLists.txt
|
||||||
|
@@ -21,6 +21,7 @@ include_directories(BEFORE ${VM_DIR})
|
||||||
|
add_definitions(-DPAL_STDCPP_COMPAT)
|
||||||
|
|
||||||
|
add_compile_options(-fPIE)
|
||||||
|
+add_link_options(-pie)
|
||||||
|
|
||||||
|
set(CREATEDUMP_SOURCES
|
||||||
|
createdump.cpp
|
46
corefx-39633-cgroupv2-mountpoints.patch
Normal file
46
corefx-39633-cgroupv2-mountpoints.patch
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
From 1864630f762160e1cb439362cc0577471624192a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Omair Majid <omajid@redhat.com>
|
||||||
|
Date: Fri, 19 Jul 2019 19:18:51 -0400
|
||||||
|
Subject: [PATCH] Fix up cgroup2fs in Interop.MountPoints.FormatInfo
|
||||||
|
|
||||||
|
`stat -fc %T /sys/fs/cgroup` calls this file system `cgroup2fs`
|
||||||
|
|
||||||
|
Add the cgroup2fs file system magic number. Available from:
|
||||||
|
|
||||||
|
- https://www.kernel.org/doc/Documentation/cgroup-v2.txt
|
||||||
|
- man 2 statfs
|
||||||
|
|
||||||
|
Move cgroup2fs next to cgroupfs in the drive type list, since it is also
|
||||||
|
DriveType.Ram.
|
||||||
|
---
|
||||||
|
.../Unix/System.Native/Interop.MountPoints.FormatInfo.cs | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs b/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs
|
||||||
|
index af38a2285ba2..4240bd4853ab 100644
|
||||||
|
--- a/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs
|
||||||
|
+++ b/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs
|
||||||
|
@@ -47,6 +47,7 @@ internal enum UnixFileSystemTypes : long
|
||||||
|
btrfs = 0x9123683E,
|
||||||
|
ceph = 0x00C36400,
|
||||||
|
cgroupfs = 0x0027E0EB,
|
||||||
|
+ cgroup2fs = 0x63677270,
|
||||||
|
cifs = 0xFF534D42,
|
||||||
|
coda = 0x73757245,
|
||||||
|
coherent = 0x012FF7B7,
|
||||||
|
@@ -231,7 +232,6 @@ private static DriveType GetDriveType(string fileSystemName)
|
||||||
|
case "bpf_fs":
|
||||||
|
case "btrfs":
|
||||||
|
case "btrfs_test":
|
||||||
|
- case "cgroup2fs":
|
||||||
|
case "coh":
|
||||||
|
case "daxfs":
|
||||||
|
case "drvfs":
|
||||||
|
@@ -384,6 +384,7 @@ private static DriveType GetDriveType(string fileSystemName)
|
||||||
|
case "binfmt_misc":
|
||||||
|
case "cgroup":
|
||||||
|
case "cgroupfs":
|
||||||
|
+ case "cgroup2fs":
|
||||||
|
case "configfs":
|
||||||
|
case "cramfs":
|
||||||
|
case "cramfs-wend":
|
391
corefx-39686-cgroupv2-01.patch
Normal file
391
corefx-39686-cgroupv2-01.patch
Normal file
|
@ -0,0 +1,391 @@
|
||||||
|
From 2b2273ea4ea1c28472fa0d6ad2ffeb6374500550 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Omair Majid <omajid@redhat.com>
|
||||||
|
Date: Wed, 23 Oct 2019 17:45:59 -0400
|
||||||
|
Subject: [PATCH 1/2] Add cgroup v2 support to Interop.cgroups
|
||||||
|
|
||||||
|
Fix up code to adjust cgroup v1 assumptions and check cgroup v2 paths,
|
||||||
|
locations and values.
|
||||||
|
|
||||||
|
Continue using the older cgroup v1 terminology for APIs.
|
||||||
|
---
|
||||||
|
.../Interop/Linux/cgroups/Interop.cgroups.cs | 116 ++++++++++++++----
|
||||||
|
src/Common/tests/Common.Tests.csproj | 4 +
|
||||||
|
.../tests/Tests/Interop/cgroupsTests.cs | 107 ++++++++++++++++
|
||||||
|
.../tests/DescriptionNameTests.cs | 2 +-
|
||||||
|
4 files changed, 206 insertions(+), 23 deletions(-)
|
||||||
|
create mode 100644 src/Common/tests/Tests/Interop/cgroupsTests.cs
|
||||||
|
|
||||||
|
diff --git a/src/Common/src/Interop/Linux/cgroups/Interop.cgroups.cs b/src/Common/src/Interop/Linux/cgroups/Interop.cgroups.cs
|
||||||
|
index 0ffd4d7b7c03..186fe0516c5b 100644
|
||||||
|
--- a/src/Common/src/Interop/Linux/cgroups/Interop.cgroups.cs
|
||||||
|
+++ b/src/Common/src/Interop/Linux/cgroups/Interop.cgroups.cs
|
||||||
|
@@ -9,17 +9,22 @@
|
||||||
|
|
||||||
|
internal static partial class Interop
|
||||||
|
{
|
||||||
|
+ /// <summary>Provides access to some cgroup (v1 and v2) features</summary>
|
||||||
|
internal static partial class cgroups
|
||||||
|
{
|
||||||
|
+ // For cgroup v1, see https://www.kernel.org/doc/Documentation/cgroup-v1/
|
||||||
|
+ // For cgroup v2, see https://www.kernel.org/doc/Documentation/cgroup-v2.txt
|
||||||
|
+
|
||||||
|
+ /// <summary>The version of cgroup that's being used </summary>
|
||||||
|
+ internal enum CGroupVersion { None, CGroup1, CGroup2 };
|
||||||
|
+
|
||||||
|
/// <summary>Path to mountinfo file in procfs for the current process.</summary>
|
||||||
|
private const string ProcMountInfoFilePath = "/proc/self/mountinfo";
|
||||||
|
/// <summary>Path to cgroup directory in procfs for the current process.</summary>
|
||||||
|
private const string ProcCGroupFilePath = "/proc/self/cgroup";
|
||||||
|
|
||||||
|
- /// <summary>Path to the found cgroup location, or null if it couldn't be found.</summary>
|
||||||
|
- internal static readonly string s_cgroupMemoryPath = FindCGroupPath("memory");
|
||||||
|
- /// <summary>Path to the found cgroup memory limit_in_bytes path, or null if it couldn't be found.</summary>
|
||||||
|
- private static readonly string s_cgroupMemoryLimitPath = s_cgroupMemoryPath != null ? s_cgroupMemoryPath + "/memory.limit_in_bytes" : null;
|
||||||
|
+ /// <summary>Path to the found cgroup memory limit path, or null if it couldn't be found.</summary>
|
||||||
|
+ internal static readonly string s_cgroupMemoryLimitPath = FindCGroupMemoryLimitPath();
|
||||||
|
|
||||||
|
/// <summary>Tries to read the memory limit from the cgroup memory location.</summary>
|
||||||
|
/// <param name="limit">The read limit, or 0 if it couldn't be read.</param>
|
||||||
|
@@ -42,7 +47,7 @@ public static bool TryGetMemoryLimit(out ulong limit)
|
||||||
|
/// <param name="path">The path to the file to parse.</param>
|
||||||
|
/// <param name="result">The parsed result, or 0 if it couldn't be parsed.</param>
|
||||||
|
/// <returns>true if the value was read successfully; otherwise, false.</returns>
|
||||||
|
- private static bool TryReadMemoryValueFromFile(string path, out ulong result)
|
||||||
|
+ internal static bool TryReadMemoryValueFromFile(string path, out ulong result)
|
||||||
|
{
|
||||||
|
if (File.Exists(path))
|
||||||
|
{
|
||||||
|
@@ -79,6 +84,11 @@ private static bool TryReadMemoryValueFromFile(string path, out ulong result)
|
||||||
|
result = checked(ulongValue * multiplier);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ // 'max' is also a possible valid value
|
||||||
|
+ //
|
||||||
|
+ // Treat this as 'no memory limit' and let the caller
|
||||||
|
+ // fallback to reading the real limit via other means
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
@@ -90,12 +100,35 @@ private static bool TryReadMemoryValueFromFile(string path, out ulong result)
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /// <summary>Find the cgroup memory limit path.</summary>
|
||||||
|
+ /// <returns>The limit path if found; otherwise, null.</returns>
|
||||||
|
+ private static string FindCGroupMemoryLimitPath()
|
||||||
|
+ {
|
||||||
|
+ string cgroupMemoryPath = FindCGroupPath("memory", out CGroupVersion version);
|
||||||
|
+ if (cgroupMemoryPath != null)
|
||||||
|
+ {
|
||||||
|
+ if (version == CGroupVersion.CGroup1)
|
||||||
|
+ {
|
||||||
|
+ return cgroupMemoryPath + "/memory.limit_in_bytes";
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (version == CGroupVersion.CGroup2)
|
||||||
|
+ {
|
||||||
|
+ // 'memory.high' is a soft limit; the process may get throttled
|
||||||
|
+ // 'memory.max' is where OOM killer kicks in
|
||||||
|
+ return cgroupMemoryPath + "/memory.max";
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return null;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/// <summary>Find the cgroup path for the specified subsystem.</summary>
|
||||||
|
/// <param name="subsystem">The subsystem, e.g. "memory".</param>
|
||||||
|
/// <returns>The cgroup path if found; otherwise, null.</returns>
|
||||||
|
- private static string FindCGroupPath(string subsystem)
|
||||||
|
+ private static string FindCGroupPath(string subsystem, out CGroupVersion version)
|
||||||
|
{
|
||||||
|
- if (TryFindHierarchyMount(subsystem, out string hierarchyRoot, out string hierarchyMount) &&
|
||||||
|
+ if (TryFindHierarchyMount(subsystem, out version, out string hierarchyRoot, out string hierarchyMount) &&
|
||||||
|
TryFindCGroupPathForSubsystem(subsystem, out string cgroupPathRelativeToMount))
|
||||||
|
{
|
||||||
|
// For a host cgroup, we need to append the relative path.
|
||||||
|
@@ -113,19 +146,24 @@ private static string FindCGroupPath(string subsystem)
|
||||||
|
/// <param name="root">The path of the directory in the filesystem which forms the root of this mount; null if not found.</param>
|
||||||
|
/// <param name="path">The path of the mount point relative to the process's root directory; null if not found.</param>
|
||||||
|
/// <returns>true if the mount was found; otherwise, null.</returns>
|
||||||
|
- private static bool TryFindHierarchyMount(string subsystem, out string root, out string path)
|
||||||
|
+ private static bool TryFindHierarchyMount(string subsystem, out CGroupVersion version, out string root, out string path)
|
||||||
|
{
|
||||||
|
- if (File.Exists(ProcMountInfoFilePath))
|
||||||
|
+ return TryFindHierarchyMount(ProcMountInfoFilePath, subsystem, out version, out root, out path);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ internal static bool TryFindHierarchyMount(string mountInfoFilePath, string subsystem, out CGroupVersion version, out string root, out string path)
|
||||||
|
+ {
|
||||||
|
+ if (File.Exists(mountInfoFilePath))
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
- using (var reader = new StreamReader(ProcMountInfoFilePath))
|
||||||
|
+ using (var reader = new StreamReader(mountInfoFilePath))
|
||||||
|
{
|
||||||
|
string line;
|
||||||
|
while ((line = reader.ReadLine()) != null)
|
||||||
|
{
|
||||||
|
// Look for an entry that has cgroup as the "filesystem type"
|
||||||
|
- // and that has options containing the specified subsystem.
|
||||||
|
+ // and, for cgroup1, that has options containing the specified subsystem
|
||||||
|
// See man page for /proc/[pid]/mountinfo for details, e.g.:
|
||||||
|
// (1)(2)(3) (4) (5) (6) (7) (8) (9) (10) (11)
|
||||||
|
// 36 35 98:0 /mnt1 /mnt2 rw,noatime master:1 - ext3 /dev/root rw,errors=continue
|
||||||
|
@@ -148,17 +186,35 @@ private static bool TryFindHierarchyMount(string subsystem, out string root, out
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (postSeparatorlineParts[0] != "cgroup" ||
|
||||||
|
- Array.IndexOf(postSeparatorlineParts[2].Split(','), subsystem) < 0)
|
||||||
|
+ bool validCGroup1Entry = ((postSeparatorlineParts[0] == "cgroup") &&
|
||||||
|
+ (Array.IndexOf(postSeparatorlineParts[2].Split(','), subsystem) >= 0));
|
||||||
|
+ bool validCGroup2Entry = postSeparatorlineParts[0] == "cgroup2";
|
||||||
|
+
|
||||||
|
+ if (!validCGroup1Entry && !validCGroup2Entry)
|
||||||
|
{
|
||||||
|
// Not the relevant entry.
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
- // Found the relevant entry. Extract the mount root and path.
|
||||||
|
+ // Found the relevant entry. Extract the cgroup version, mount root and path.
|
||||||
|
+ switch (postSeparatorlineParts[0])
|
||||||
|
+ {
|
||||||
|
+ case "cgroup":
|
||||||
|
+ version = CGroupVersion.CGroup1;
|
||||||
|
+ break;
|
||||||
|
+ case "cgroup2":
|
||||||
|
+ version = CGroupVersion.CGroup2;
|
||||||
|
+ break;
|
||||||
|
+ default:
|
||||||
|
+ version = CGroupVersion.None;
|
||||||
|
+ Debug.Fail($"invalid value for CGroupVersion \"{postSeparatorlineParts[0]}\"");
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
string[] lineParts = line.Substring(0, endOfOptionalFields).Split(' ');
|
||||||
|
root = lineParts[3];
|
||||||
|
path = lineParts[4];
|
||||||
|
+
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -169,6 +225,7 @@ private static bool TryFindHierarchyMount(string subsystem, out string root, out
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ version = CGroupVersion.None;
|
||||||
|
root = null;
|
||||||
|
path = null;
|
||||||
|
return false;
|
||||||
|
@@ -180,27 +237,42 @@ private static bool TryFindHierarchyMount(string subsystem, out string root, out
|
||||||
|
/// <returns></returns>
|
||||||
|
private static bool TryFindCGroupPathForSubsystem(string subsystem, out string path)
|
||||||
|
{
|
||||||
|
- if (File.Exists(ProcCGroupFilePath))
|
||||||
|
+ return TryFindCGroupPathForSubsystem(ProcCGroupFilePath, subsystem, out path);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ internal static bool TryFindCGroupPathForSubsystem(string procCGroupFilePath, string subsystem, out string path)
|
||||||
|
+ {
|
||||||
|
+ if (File.Exists(procCGroupFilePath))
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
- using (var reader = new StreamReader(ProcCGroupFilePath))
|
||||||
|
+ using (var reader = new StreamReader(procCGroupFilePath))
|
||||||
|
{
|
||||||
|
string line;
|
||||||
|
while ((line = reader.ReadLine()) != null)
|
||||||
|
{
|
||||||
|
- // Find the first entry that has the subsystem listed in its controller
|
||||||
|
- // list. See man page for cgroups for /proc/[pid]/cgroups format, e.g:
|
||||||
|
- // hierarchy-ID:controller-list:cgroup-path
|
||||||
|
- // 5:cpuacct,cpu,cpuset:/daemons
|
||||||
|
-
|
||||||
|
string[] lineParts = line.Split(':');
|
||||||
|
+
|
||||||
|
if (lineParts.Length != 3)
|
||||||
|
{
|
||||||
|
// Malformed line.
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // cgroup v2: Find the first entry that matches the cgroup v2 hierarchy:
|
||||||
|
+ // 0::$PATH
|
||||||
|
+
|
||||||
|
+ if ((lineParts[0] == "0") && (string.Empty == lineParts[1]))
|
||||||
|
+ {
|
||||||
|
+ path = lineParts[2];
|
||||||
|
+ return true;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // cgroup v1: Find the first entry that has the subsystem listed in its controller
|
||||||
|
+ // list. See man page for cgroups for /proc/[pid]/cgroups format, e.g:
|
||||||
|
+ // hierarchy-ID:controller-list:cgroup-path
|
||||||
|
+ // 5:cpuacct,cpu,cpuset:/daemons
|
||||||
|
+
|
||||||
|
if (Array.IndexOf(lineParts[1].Split(','), subsystem) < 0)
|
||||||
|
{
|
||||||
|
// Not the relevant entry.
|
||||||
|
@@ -214,7 +286,7 @@ private static bool TryFindCGroupPathForSubsystem(string subsystem, out string p
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
- Debug.Fail($"Failed to read or parse \"{ProcMountInfoFilePath}\": {e}");
|
||||||
|
+ Debug.Fail($"Failed to read or parse \"{procCGroupFilePath}\": {e}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/src/Common/tests/Common.Tests.csproj b/src/Common/tests/Common.Tests.csproj
|
||||||
|
index a189d856348b..979c8dd7fbe6 100644
|
||||||
|
--- a/src/Common/tests/Common.Tests.csproj
|
||||||
|
+++ b/src/Common/tests/Common.Tests.csproj
|
||||||
|
@@ -12,6 +12,9 @@
|
||||||
|
<Compile Include="$(CommonTestPath)\System\Security\Cryptography\ByteUtils.cs">
|
||||||
|
<Link>Common\System\Security\Cryptography\ByteUtils.cs</Link>
|
||||||
|
</Compile>
|
||||||
|
+ <Compile Include="$(CommonPath)\Interop\Linux\cgroups\Interop.cgroups.cs">
|
||||||
|
+ <Link>Common\Interop\Linux\cgroups\Interop.cgroups.cs</Link>
|
||||||
|
+ </Compile>
|
||||||
|
<Compile Include="$(CommonPath)\Interop\Linux\procfs\Interop.ProcFsStat.cs">
|
||||||
|
<Link>Common\Interop\Linux\procfs\Interop.ProcFsStat.cs</Link>
|
||||||
|
</Compile>
|
||||||
|
@@ -69,6 +72,7 @@
|
||||||
|
<Compile Include="$(CommonPath)\CoreLib\System\PasteArguments.cs">
|
||||||
|
<Link>Common\CoreLib\System\PasteArguments.cs</Link>
|
||||||
|
</Compile>
|
||||||
|
+ <Compile Include="Tests\Interop\cgroupsTests.cs" />
|
||||||
|
<Compile Include="Tests\Interop\procfsTests.cs" />
|
||||||
|
<Compile Include="Tests\System\CharArrayHelpersTests.cs" />
|
||||||
|
<Compile Include="Tests\System\IO\PathInternal.Tests.cs" />
|
||||||
|
diff --git a/src/Common/tests/Tests/Interop/cgroupsTests.cs b/src/Common/tests/Tests/Interop/cgroupsTests.cs
|
||||||
|
new file mode 100644
|
||||||
|
index 000000000000..f16d9242879c
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/src/Common/tests/Tests/Interop/cgroupsTests.cs
|
||||||
|
@@ -0,0 +1,107 @@
|
||||||
|
+// Licensed to the .NET Foundation under one or more agreements.
|
||||||
|
+// The .NET Foundation licenses this file to you under the MIT license.
|
||||||
|
+// See the LICENSE file in the project root for more information.
|
||||||
|
+
|
||||||
|
+using System;
|
||||||
|
+using System.IO;
|
||||||
|
+using System.Text;
|
||||||
|
+using Xunit;
|
||||||
|
+
|
||||||
|
+namespace Common.Tests
|
||||||
|
+{
|
||||||
|
+ public class cgroupsTests
|
||||||
|
+ {
|
||||||
|
+ [Theory]
|
||||||
|
+ [InlineData(true, "0", 0)]
|
||||||
|
+ [InlineData(false, "max", 0)]
|
||||||
|
+ [InlineData(true, "1k", 1024)]
|
||||||
|
+ [InlineData(true, "1K", 1024)]
|
||||||
|
+ public static void ValidateTryReadMemoryValue(bool expectedResult, string valueText, ulong expectedValue)
|
||||||
|
+ {
|
||||||
|
+ string path = Path.GetTempFileName();
|
||||||
|
+ try
|
||||||
|
+ {
|
||||||
|
+ File.WriteAllText(path, valueText);
|
||||||
|
+
|
||||||
|
+ bool result = Interop.cgroups.TryReadMemoryValueFromFile(path, out ulong val);
|
||||||
|
+
|
||||||
|
+ Assert.Equal(expectedResult, result);
|
||||||
|
+ if (result)
|
||||||
|
+ {
|
||||||
|
+ Assert.Equal(expectedValue, val);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ finally
|
||||||
|
+ {
|
||||||
|
+ File.Delete(path);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ [Theory]
|
||||||
|
+ [InlineData(false, "0 0 0:0 / /foo ignore ignore - overlay overlay ignore", "ignore", 0, "/", "/")]
|
||||||
|
+ [InlineData(true, "0 0 0:0 / /foo ignore ignore - cgroup2 cgroup2 ignore", "ignore", 2, "/", "/foo")]
|
||||||
|
+ [InlineData(true, "0 0 0:0 / /foo ignore ignore - cgroup2 cgroup2 ignore", "memory", 2, "/", "/foo")]
|
||||||
|
+ [InlineData(true, "0 0 0:0 / /foo ignore ignore - cgroup2 cgroup2 ignore", "cpu", 2, "/", "/foo")]
|
||||||
|
+ [InlineData(true, "0 0 0:0 / /foo ignore - cgroup2 cgroup2 ignore", "cpu", 2, "/", "/foo")]
|
||||||
|
+ [InlineData(true, "0 0 0:0 / /foo ignore ignore ignore - cgroup2 cgroup2 ignore", "cpu", 2, "/", "/foo")]
|
||||||
|
+ [InlineData(true, "0 0 0:0 / /foo-with-dashes ignore ignore - cgroup2 cgroup2 ignore", "ignore", 2, "/", "/foo-with-dashes")]
|
||||||
|
+ [InlineData(true, "0 0 0:0 / /foo ignore ignore - cgroup cgroup memory", "memory", 1, "/", "/foo")]
|
||||||
|
+ [InlineData(true, "0 0 0:0 / /foo-with-dashes ignore ignore - cgroup cgroup memory", "memory", 1, "/", "/foo-with-dashes")]
|
||||||
|
+ [InlineData(true, "0 0 0:0 / /foo ignore ignore - cgroup cgroup cpu,memory", "memory", 1, "/", "/foo")]
|
||||||
|
+ [InlineData(true, "0 0 0:0 / /foo ignore ignore - cgroup cgroup memory,cpu", "memory", 1, "/", "/foo")]
|
||||||
|
+ [InlineData(false, "0 0 0:0 / /foo ignore ignore - cgroup cgroup cpu", "memory", 0, "/", "/foo")]
|
||||||
|
+ public static void ParseValidateMountInfo(bool found, string procSelfMountInfoText, string subsystem, int expectedVersion, string expectedRoot, string expectedMount)
|
||||||
|
+ {
|
||||||
|
+ string path = Path.GetTempFileName();
|
||||||
|
+ try
|
||||||
|
+ {
|
||||||
|
+ File.WriteAllText(path, procSelfMountInfoText);
|
||||||
|
+
|
||||||
|
+ bool result = Interop.cgroups.TryFindHierarchyMount(path, subsystem, out Interop.cgroups.CGroupVersion version, out string root, out string mount);
|
||||||
|
+
|
||||||
|
+ Assert.Equal(found, result);
|
||||||
|
+ if (found)
|
||||||
|
+ {
|
||||||
|
+ Assert.Equal(expectedVersion, (int)version);
|
||||||
|
+ Assert.Equal(expectedRoot, root);
|
||||||
|
+ Assert.Equal(expectedMount, mount);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ finally
|
||||||
|
+ {
|
||||||
|
+ File.Delete(path);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ [Theory]
|
||||||
|
+ [InlineData(true, "0::/foo", "ignore", "/foo")]
|
||||||
|
+ [InlineData(true, "0::/bar", "ignore", "/bar")]
|
||||||
|
+ [InlineData(true, "0::frob", "ignore", "frob")]
|
||||||
|
+ [InlineData(false, "1::frob", "ignore", "ignore")]
|
||||||
|
+ [InlineData(true, "1:foo:bar", "foo", "bar")]
|
||||||
|
+ [InlineData(true, "2:foo:bar", "foo", "bar")]
|
||||||
|
+ [InlineData(false, "2:foo:bar", "bar", "ignore")]
|
||||||
|
+ [InlineData(true, "1:foo:bar\n2:eggs:spam", "foo", "bar")]
|
||||||
|
+ [InlineData(true, "1:foo:bar\n2:eggs:spam", "eggs", "spam")]
|
||||||
|
+ public static void ParseValidateProcCGroup(bool found, string procSelfCgroupText, string subsystem, string expectedMountPath)
|
||||||
|
+ {
|
||||||
|
+ string path = Path.GetTempFileName();
|
||||||
|
+ try
|
||||||
|
+ {
|
||||||
|
+ File.WriteAllText(path, procSelfCgroupText);
|
||||||
|
+
|
||||||
|
+ bool result = Interop.cgroups.TryFindCGroupPathForSubsystem(path, subsystem, out string mountPath);
|
||||||
|
+
|
||||||
|
+ Assert.Equal(found, result);
|
||||||
|
+ if (found)
|
||||||
|
+ {
|
||||||
|
+ Assert.Equal(expectedMountPath, mountPath);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ finally
|
||||||
|
+ {
|
||||||
|
+ File.Delete(path);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/tests/DescriptionNameTests.cs b/src/System.Runtime.InteropServices.RuntimeInformation/tests/DescriptionNameTests.cs
|
||||||
|
index 910af2fd82b4..73f692898dbc 100644
|
||||||
|
--- a/src/System.Runtime.InteropServices.RuntimeInformation/tests/DescriptionNameTests.cs
|
||||||
|
+++ b/src/System.Runtime.InteropServices.RuntimeInformation/tests/DescriptionNameTests.cs
|
||||||
|
@@ -40,7 +40,7 @@ public void DumpRuntimeInformationToConsole()
|
||||||
|
|
||||||
|
Console.WriteLine($"### CURRENT DIRECTORY: {Environment.CurrentDirectory}");
|
||||||
|
|
||||||
|
- string cgroupsLocation = Interop.cgroups.s_cgroupMemoryPath;
|
||||||
|
+ string cgroupsLocation = Interop.cgroups.s_cgroupMemoryLimitPath;
|
||||||
|
if (cgroupsLocation != null)
|
||||||
|
{
|
||||||
|
Console.WriteLine($"### CGROUPS MEMORY: {cgroupsLocation}");
|
||||||
|
|
129
corefx-39686-cgroupv2-02.patch
Normal file
129
corefx-39686-cgroupv2-02.patch
Normal file
|
@ -0,0 +1,129 @@
|
||||||
|
From 9a8c5e4014ffca8aff70808cc0e50a403d38c292 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Stephen Toub <stoub@microsoft.com>
|
||||||
|
Date: Wed, 23 Oct 2019 20:35:49 -0400
|
||||||
|
Subject: [PATCH 2/2] Clean up new tests
|
||||||
|
|
||||||
|
---
|
||||||
|
.../tests/Tests/Interop/cgroupsTests.cs | 79 ++++++-------------
|
||||||
|
1 file changed, 25 insertions(+), 54 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/Common/tests/Tests/Interop/cgroupsTests.cs b/src/Common/tests/Tests/Interop/cgroupsTests.cs
|
||||||
|
index f16d9242879c..fc6ab5c9753c 100644
|
||||||
|
--- a/src/Common/tests/Tests/Interop/cgroupsTests.cs
|
||||||
|
+++ b/src/Common/tests/Tests/Interop/cgroupsTests.cs
|
||||||
|
@@ -2,38 +2,27 @@
|
||||||
|
// The .NET Foundation licenses this file to you under the MIT license.
|
||||||
|
// See the LICENSE file in the project root for more information.
|
||||||
|
|
||||||
|
-using System;
|
||||||
|
using System.IO;
|
||||||
|
-using System.Text;
|
||||||
|
using Xunit;
|
||||||
|
|
||||||
|
namespace Common.Tests
|
||||||
|
{
|
||||||
|
- public class cgroupsTests
|
||||||
|
+ public class cgroupsTests : FileCleanupTestBase
|
||||||
|
{
|
||||||
|
[Theory]
|
||||||
|
- [InlineData(true, "0", 0)]
|
||||||
|
- [InlineData(false, "max", 0)]
|
||||||
|
- [InlineData(true, "1k", 1024)]
|
||||||
|
- [InlineData(true, "1K", 1024)]
|
||||||
|
- public static void ValidateTryReadMemoryValue(bool expectedResult, string valueText, ulong expectedValue)
|
||||||
|
+ [InlineData(true, "0", 0)]
|
||||||
|
+ [InlineData(false, "max", 0)]
|
||||||
|
+ [InlineData(true, "1k", 1024)]
|
||||||
|
+ [InlineData(true, "1K", 1024)]
|
||||||
|
+ public void ValidateTryReadMemoryValue(bool expectedResult, string valueText, ulong expectedValue)
|
||||||
|
{
|
||||||
|
- string path = Path.GetTempFileName();
|
||||||
|
- try
|
||||||
|
- {
|
||||||
|
- File.WriteAllText(path, valueText);
|
||||||
|
-
|
||||||
|
- bool result = Interop.cgroups.TryReadMemoryValueFromFile(path, out ulong val);
|
||||||
|
+ string path = GetTestFilePath();
|
||||||
|
+ File.WriteAllText(path, valueText);
|
||||||
|
|
||||||
|
- Assert.Equal(expectedResult, result);
|
||||||
|
- if (result)
|
||||||
|
- {
|
||||||
|
- Assert.Equal(expectedValue, val);
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
- finally
|
||||||
|
+ Assert.Equal(expectedResult, Interop.cgroups.TryReadMemoryValueFromFile(path, out ulong val));
|
||||||
|
+ if (expectedResult)
|
||||||
|
{
|
||||||
|
- File.Delete(path);
|
||||||
|
+ Assert.Equal(expectedValue, val);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -50,26 +39,17 @@ public static void ValidateTryReadMemoryValue(bool expectedResult, string valueT
|
||||||
|
[InlineData(true, "0 0 0:0 / /foo ignore ignore - cgroup cgroup cpu,memory", "memory", 1, "/", "/foo")]
|
||||||
|
[InlineData(true, "0 0 0:0 / /foo ignore ignore - cgroup cgroup memory,cpu", "memory", 1, "/", "/foo")]
|
||||||
|
[InlineData(false, "0 0 0:0 / /foo ignore ignore - cgroup cgroup cpu", "memory", 0, "/", "/foo")]
|
||||||
|
- public static void ParseValidateMountInfo(bool found, string procSelfMountInfoText, string subsystem, int expectedVersion, string expectedRoot, string expectedMount)
|
||||||
|
+ public void ParseValidateMountInfo(bool expectedFound, string procSelfMountInfoText, string subsystem, int expectedVersion, string expectedRoot, string expectedMount)
|
||||||
|
{
|
||||||
|
- string path = Path.GetTempFileName();
|
||||||
|
- try
|
||||||
|
- {
|
||||||
|
- File.WriteAllText(path, procSelfMountInfoText);
|
||||||
|
-
|
||||||
|
- bool result = Interop.cgroups.TryFindHierarchyMount(path, subsystem, out Interop.cgroups.CGroupVersion version, out string root, out string mount);
|
||||||
|
+ string path = GetTestFilePath();
|
||||||
|
+ File.WriteAllText(path, procSelfMountInfoText);
|
||||||
|
|
||||||
|
- Assert.Equal(found, result);
|
||||||
|
- if (found)
|
||||||
|
- {
|
||||||
|
- Assert.Equal(expectedVersion, (int)version);
|
||||||
|
- Assert.Equal(expectedRoot, root);
|
||||||
|
- Assert.Equal(expectedMount, mount);
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
- finally
|
||||||
|
+ Assert.Equal(expectedFound, Interop.cgroups.TryFindHierarchyMount(path, subsystem, out Interop.cgroups.CGroupVersion version, out string root, out string mount));
|
||||||
|
+ if (expectedFound)
|
||||||
|
{
|
||||||
|
- File.Delete(path);
|
||||||
|
+ Assert.Equal(expectedVersion, (int)version);
|
||||||
|
+ Assert.Equal(expectedRoot, root);
|
||||||
|
+ Assert.Equal(expectedMount, mount);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -83,24 +63,15 @@ public static void ParseValidateMountInfo(bool found, string procSelfMountInfoTe
|
||||||
|
[InlineData(false, "2:foo:bar", "bar", "ignore")]
|
||||||
|
[InlineData(true, "1:foo:bar\n2:eggs:spam", "foo", "bar")]
|
||||||
|
[InlineData(true, "1:foo:bar\n2:eggs:spam", "eggs", "spam")]
|
||||||
|
- public static void ParseValidateProcCGroup(bool found, string procSelfCgroupText, string subsystem, string expectedMountPath)
|
||||||
|
+ public void ParseValidateProcCGroup(bool expectedFound, string procSelfCgroupText, string subsystem, string expectedMountPath)
|
||||||
|
{
|
||||||
|
- string path = Path.GetTempFileName();
|
||||||
|
- try
|
||||||
|
- {
|
||||||
|
- File.WriteAllText(path, procSelfCgroupText);
|
||||||
|
+ string path = GetTestFilePath();
|
||||||
|
+ File.WriteAllText(path, procSelfCgroupText);
|
||||||
|
|
||||||
|
- bool result = Interop.cgroups.TryFindCGroupPathForSubsystem(path, subsystem, out string mountPath);
|
||||||
|
-
|
||||||
|
- Assert.Equal(found, result);
|
||||||
|
- if (found)
|
||||||
|
- {
|
||||||
|
- Assert.Equal(expectedMountPath, mountPath);
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
- finally
|
||||||
|
+ Assert.Equal(expectedFound, Interop.cgroups.TryFindCGroupPathForSubsystem(path, subsystem, out string mountPath));
|
||||||
|
+ if (expectedFound)
|
||||||
|
{
|
||||||
|
- File.Delete(path);
|
||||||
|
+ Assert.Equal(expectedMountPath, mountPath);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
124
corefx-43032-fedora-35-rid.patch
Normal file
124
corefx-43032-fedora-35-rid.patch
Normal file
|
@ -0,0 +1,124 @@
|
||||||
|
From 66d0116c74a33e43b171f3ef5323e8a3883ceb18 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Omair Majid <omajid@redhat.com>
|
||||||
|
Date: Fri, 12 Feb 2021 11:01:36 -0500
|
||||||
|
Subject: [PATCH] Add Fedora 35 RID
|
||||||
|
|
||||||
|
Fedora rawhide now uses the fedora.35-x64 RID:
|
||||||
|
|
||||||
|
$ podman run -it registry.fedoraproject.org/fedora:rawhide /bin/bash -c 'cat /etc/os-release'
|
||||||
|
NAME=Fedora
|
||||||
|
VERSION="35 (Container Image Prerelease)"
|
||||||
|
ID=fedora
|
||||||
|
VERSION_ID=35
|
||||||
|
VERSION_CODENAME=""
|
||||||
|
PLATFORM_ID="platform:f35"
|
||||||
|
PRETTY_NAME="Fedora 35 (Container Image Prerelease)"
|
||||||
|
ANSI_COLOR="0;38;2;60;110;180"
|
||||||
|
LOGO=fedora-logo-icon
|
||||||
|
CPE_NAME="cpe:/o:fedoraproject:fedora:35"
|
||||||
|
HOME_URL="https://fedoraproject.org/"
|
||||||
|
DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora/rawhide/system-administrators-guide/"
|
||||||
|
SUPPORT_URL="https://fedoraproject.org/wiki/Communicating_and_getting_help"
|
||||||
|
BUG_REPORT_URL="https://bugzilla.redhat.com/"
|
||||||
|
REDHAT_BUGZILLA_PRODUCT="Fedora"
|
||||||
|
REDHAT_BUGZILLA_PRODUCT_VERSION=rawhide
|
||||||
|
REDHAT_SUPPORT_PRODUCT="Fedora"
|
||||||
|
REDHAT_SUPPORT_PRODUCT_VERSION=rawhide
|
||||||
|
PRIVACY_POLICY_URL="https://fedoraproject.org/wiki/Legal:PrivacyPolicy"
|
||||||
|
VARIANT="Container Image"
|
||||||
|
VARIANT_ID=container
|
||||||
|
|
||||||
|
This is a backport of https://github.com/dotnet/runtime/pull/48200.
|
||||||
|
---
|
||||||
|
eng/Packaging.props | 2 +-
|
||||||
|
.../runtime.compatibility.json | 32 +++++++++++++++++++
|
||||||
|
pkg/Microsoft.NETCore.Platforms/runtime.json | 17 ++++++++++
|
||||||
|
.../runtimeGroups.props | 2 +-
|
||||||
|
.../packageIndex.json | 5 +--
|
||||||
|
src/packages.builds | 3 ++
|
||||||
|
6 files changed, 57 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
|
||||||
|
index 382ee4552177..bb045b0856f1 100644
|
||||||
|
--- a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
|
||||||
|
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
|
||||||
|
@@ -1102,6 +1102,38 @@
|
||||||
|
"any",
|
||||||
|
"base"
|
||||||
|
],
|
||||||
|
+ "fedora.35": [
|
||||||
|
+ "fedora.35",
|
||||||
|
+ "fedora",
|
||||||
|
+ "linux",
|
||||||
|
+ "unix",
|
||||||
|
+ "any",
|
||||||
|
+ "base"
|
||||||
|
+ ],
|
||||||
|
+ "fedora.35-arm64": [
|
||||||
|
+ "fedora.35-arm64",
|
||||||
|
+ "fedora.35",
|
||||||
|
+ "fedora-arm64",
|
||||||
|
+ "fedora",
|
||||||
|
+ "linux-arm64",
|
||||||
|
+ "linux",
|
||||||
|
+ "unix-arm64",
|
||||||
|
+ "unix",
|
||||||
|
+ "any",
|
||||||
|
+ "base"
|
||||||
|
+ ],
|
||||||
|
+ "fedora.35-x64": [
|
||||||
|
+ "fedora.35-x64",
|
||||||
|
+ "fedora.35",
|
||||||
|
+ "fedora-x64",
|
||||||
|
+ "fedora",
|
||||||
|
+ "linux-x64",
|
||||||
|
+ "linux",
|
||||||
|
+ "unix-x64",
|
||||||
|
+ "unix",
|
||||||
|
+ "any",
|
||||||
|
+ "base"
|
||||||
|
+ ],
|
||||||
|
"freebsd": [
|
||||||
|
"freebsd",
|
||||||
|
"unix",
|
||||||
|
diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json
|
||||||
|
index a50be8567ce0..10b204def550 100644
|
||||||
|
--- a/pkg/Microsoft.NETCore.Platforms/runtime.json
|
||||||
|
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.json
|
||||||
|
@@ -544,6 +544,23 @@
|
||||||
|
"fedora-x64"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
+ "fedora.35": {
|
||||||
|
+ "#import": [
|
||||||
|
+ "fedora"
|
||||||
|
+ ]
|
||||||
|
+ },
|
||||||
|
+ "fedora.35-arm64": {
|
||||||
|
+ "#import": [
|
||||||
|
+ "fedora.35",
|
||||||
|
+ "fedora-arm64"
|
||||||
|
+ ]
|
||||||
|
+ },
|
||||||
|
+ "fedora.35-x64": {
|
||||||
|
+ "#import": [
|
||||||
|
+ "fedora.35",
|
||||||
|
+ "fedora-x64"
|
||||||
|
+ ]
|
||||||
|
+ },
|
||||||
|
"freebsd": {
|
||||||
|
"#import": [
|
||||||
|
"unix"
|
||||||
|
diff --git a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
|
||||||
|
index faa697f34e20..8b9c2e47ba2d 100644
|
||||||
|
--- a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
|
||||||
|
+++ b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
|
||||||
|
@@ -43,7 +43,7 @@
|
||||||
|
<RuntimeGroup Include="fedora">
|
||||||
|
<Parent>linux</Parent>
|
||||||
|
<Architectures>x64;arm64</Architectures>
|
||||||
|
- <Versions>23;24;25;26;27;28;29;30;31;32;33;34</Versions>
|
||||||
|
+ <Versions>23;24;25;26;27;28;29;30;31;32;33;34;35</Versions>
|
||||||
|
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
|
||||||
|
</RuntimeGroup>
|
||||||
|
|
40
corefx-optflags-support.patch
Normal file
40
corefx-optflags-support.patch
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
diff --git a/src/Native/Unix/CMakeLists.txt b/src/Native/Unix/CMakeLists.txt
|
||||||
|
index 7d804a1e54..717c2718d7 100644
|
||||||
|
--- a/src/Native/Unix/CMakeLists.txt
|
||||||
|
+++ b/src/Native/Unix/CMakeLists.txt
|
||||||
|
@@ -25,7 +25,7 @@ add_compile_options(-fPIC)
|
||||||
|
add_compile_options(-Wthread-safety)
|
||||||
|
add_compile_options(-Wno-thread-safety-analysis)
|
||||||
|
+ add_compile_options(-Wno-alloca)
|
||||||
|
endif()
|
||||||
|
-add_compile_options(-Werror)
|
||||||
|
|
||||||
|
if(CMAKE_SYSTEM_NAME STREQUAL Emscripten)
|
||||||
|
set(CLR_CMAKE_PLATFORM_WASM 1)
|
||||||
|
diff --git a/src/Native/Unix/configure.cmake b/src/Native/Unix/configure.cmake
|
||||||
|
index f4a30ad6cb..f2db68402a 100644
|
||||||
|
--- a/src/Native/Unix/configure.cmake
|
||||||
|
+++ b/src/Native/Unix/configure.cmake
|
||||||
|
@@ -27,6 +27,12 @@ else ()
|
||||||
|
message(FATAL_ERROR "Unknown platform. Cannot define PAL_UNIX_NAME, used by RuntimeInformation.")
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
+
|
||||||
|
+set (PREVIOUS_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
|
||||||
|
+set (CMAKE_CXX_FLAGS "-D_GNU_SOURCE")
|
||||||
|
+set (PREVIOUS_CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
|
||||||
|
+set (CMAKE_C_FLAGS "-D_GNU_SOURCE")
|
||||||
|
+
|
||||||
|
# We compile with -Werror, so we need to make sure these code fragments compile without warnings.
|
||||||
|
# Older CMake versions (3.8) do not assign the result of their tests, causing unused-value errors
|
||||||
|
# which are not distinguished from the test failing. So no error for that one.
|
||||||
|
@@ -698,6 +704,9 @@ endif()
|
||||||
|
|
||||||
|
set (CMAKE_REQUIRED_LIBRARIES)
|
||||||
|
|
||||||
|
+set (CMAKE_CXX_FLAGS "${PREVIOUS_CMAKE_CXX_FLAGS}")
|
||||||
|
+set (CMAKE_C_FLAGS "${PREVIOUS_CMAKE_C_FLAGS}")
|
||||||
|
+
|
||||||
|
check_c_source_compiles(
|
||||||
|
"
|
||||||
|
#include <sys/inotify.h>
|
14
dotnet.sh.in
Normal file
14
dotnet.sh.in
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
|
||||||
|
# Set location for AppHost lookup
|
||||||
|
[ -z "$DOTNET_ROOT" ] && export DOTNET_ROOT=@LIBDIR@/dotnet
|
||||||
|
|
||||||
|
# Add dotnet tools directory to PATH
|
||||||
|
DOTNET_TOOLS_PATH="$HOME/.dotnet/tools"
|
||||||
|
case "$PATH" in
|
||||||
|
*"$DOTNET_TOOLS_PATH"* ) true ;;
|
||||||
|
* ) PATH="$PATH:$DOTNET_TOOLS_PATH" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# Extract self-contained executables under HOME
|
||||||
|
# to avoid multi-user issues from using the default '/var/tmp'.
|
||||||
|
[ -z "$DOTNET_BUNDLE_EXTRACT_BASE_DIR" ] && export DOTNET_BUNDLE_EXTRACT_BASE_DIR="${XDG_CACHE_HOME:-"$HOME"/.cache}/dotnet_bundle_extract"
|
850
dotnet3.1.spec
Normal file
850
dotnet3.1.spec
Normal file
|
@ -0,0 +1,850 @@
|
||||||
|
%bcond_with bootstrap
|
||||||
|
|
||||||
|
# Avoid provides/requires from private libraries
|
||||||
|
%global privlibs libhostfxr
|
||||||
|
%global privlibs %{privlibs}|libclrjit
|
||||||
|
%global privlibs %{privlibs}|libcoreclr
|
||||||
|
%global privlibs %{privlibs}|libcoreclrtraceptprovider
|
||||||
|
%global privlibs %{privlibs}|libdbgshim
|
||||||
|
%global privlibs %{privlibs}|libhostpolicy
|
||||||
|
%global privlibs %{privlibs}|libmscordaccore
|
||||||
|
%global privlibs %{privlibs}|libmscordbi
|
||||||
|
%global privlibs %{privlibs}|libsos
|
||||||
|
%global privlibs %{privlibs}|libsosplugin
|
||||||
|
%global __provides_exclude ^(%{privlibs})\\.so
|
||||||
|
%global __requires_exclude ^(%{privlibs})\\.so
|
||||||
|
|
||||||
|
# LTO triggers a compilation error for a source level issue. Given that LTO should not
|
||||||
|
# change the validity of any given source and the nature of the error (undefined enum), I
|
||||||
|
# suspect a generator program is mis-behaving in some way. This needs further debugging,
|
||||||
|
# until that's done, disable LTO. This has to happen before setting the flags below.
|
||||||
|
%define _lto_cflags %{nil}
|
||||||
|
|
||||||
|
|
||||||
|
%global host_version 3.1.12
|
||||||
|
%global runtime_version 3.1.12
|
||||||
|
%global aspnetcore_runtime_version %{runtime_version}
|
||||||
|
%global sdk_version 3.1.112
|
||||||
|
# upstream can update releases without revving the SDK version so these don't always match
|
||||||
|
%global src_version %{sdk_version}
|
||||||
|
%global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
|
||||||
|
|
||||||
|
%global host_rpm_version %{host_version}
|
||||||
|
%global aspnetcore_runtime_rpm_version %{aspnetcore_runtime_version}
|
||||||
|
%global runtime_rpm_version %{runtime_version}
|
||||||
|
%global sdk_rpm_version %{sdk_version}
|
||||||
|
|
||||||
|
%if 0%{?fedora} || 0%{?rhel} < 8
|
||||||
|
%global use_bundled_libunwind 0
|
||||||
|
%else
|
||||||
|
%global use_bundled_libunwind 1
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%ifarch aarch64
|
||||||
|
%global use_bundled_libunwind 1
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%ifarch x86_64
|
||||||
|
%global runtime_arch x64
|
||||||
|
%endif
|
||||||
|
%ifarch aarch64
|
||||||
|
%global runtime_arch arm64
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%{!?runtime_id:%global runtime_id %(. /etc/os-release ; echo "${ID}.${VERSION_ID%%.*}")-%{runtime_arch}}
|
||||||
|
|
||||||
|
Name: dotnet3.1
|
||||||
|
Version: %{sdk_rpm_version}
|
||||||
|
Release: 3%{?dist}
|
||||||
|
Summary: .NET Core 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/
|
||||||
|
|
||||||
|
# The source is generated on a Fedora box via:
|
||||||
|
# ./build-dotnet-tarball v%%{src_version}-SDK
|
||||||
|
Source0: dotnet-v%{src_version}-SDK.tar.gz
|
||||||
|
Source1: check-debug-symbols.py
|
||||||
|
Source2: dotnet.sh.in
|
||||||
|
|
||||||
|
Patch1: source-build-warnings-are-not-errors.patch
|
||||||
|
|
||||||
|
# Fix building with our additional CFLAGS/CXXFLAGS/LDFLAGS
|
||||||
|
Patch100: corefx-optflags-support.patch
|
||||||
|
|
||||||
|
# Add some support for cgroupv2 in corefx
|
||||||
|
# All these patches are upstreamed for 5.0
|
||||||
|
Patch101: corefx-39686-cgroupv2-01.patch
|
||||||
|
Patch102: corefx-39686-cgroupv2-02.patch
|
||||||
|
Patch103: corefx-39633-cgroupv2-mountpoints.patch
|
||||||
|
|
||||||
|
# https://github.com/dotnet/corefx/pull/43032
|
||||||
|
Patch104: corefx-43032-fedora-35-rid.patch
|
||||||
|
|
||||||
|
# Build with with hardening flags, including -pie
|
||||||
|
Patch200: coreclr-hardening-flags.patch
|
||||||
|
# Fix build with clang 10; Already applied at tarball-build time
|
||||||
|
# Patch201: coreclr-clang10.patch
|
||||||
|
# Fix build on recent versions of gcc/clang
|
||||||
|
# https://github.com/libunwind/libunwind/pull/166
|
||||||
|
# Already applied
|
||||||
|
#Patch202: coreclr-libunwind-fno-common.patch
|
||||||
|
|
||||||
|
# Build with with hardening flags, including -pie
|
||||||
|
Patch300: core-setup-hardening-flags.patch
|
||||||
|
Patch301: core-setup-gcc11.patch
|
||||||
|
|
||||||
|
# Disable telemetry by default; make it opt-in
|
||||||
|
Patch500: cli-telemetry-optout.patch
|
||||||
|
|
||||||
|
|
||||||
|
%if 0%{?fedora} > 32 || 0%{?rhel} > 8
|
||||||
|
ExclusiveArch: aarch64 x86_64
|
||||||
|
%else
|
||||||
|
ExclusiveArch: x86_64
|
||||||
|
%endif
|
||||||
|
|
||||||
|
BuildRequires: clang
|
||||||
|
BuildRequires: cmake
|
||||||
|
BuildRequires: coreutils
|
||||||
|
%if %{without bootstrap}
|
||||||
|
BuildRequires: dotnet-build-reference-packages
|
||||||
|
BuildRequires: dotnet-sdk-3.1
|
||||||
|
BuildRequires: dotnet-sdk-3.1-source-built-artifacts
|
||||||
|
%endif
|
||||||
|
BuildRequires: findutils
|
||||||
|
BuildRequires: git
|
||||||
|
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||||
|
BuildRequires: glibc-langpack-en
|
||||||
|
%endif
|
||||||
|
BuildRequires: hostname
|
||||||
|
BuildRequires: krb5-devel
|
||||||
|
BuildRequires: libcurl-devel
|
||||||
|
BuildRequires: libicu-devel
|
||||||
|
%if ! %{use_bundled_libunwind}
|
||||||
|
BuildRequires: libunwind-devel
|
||||||
|
%endif
|
||||||
|
BuildRequires: lldb-devel
|
||||||
|
BuildRequires: llvm
|
||||||
|
BuildRequires: lttng-ust-devel
|
||||||
|
BuildRequires: make
|
||||||
|
BuildRequires: openssl-devel
|
||||||
|
BuildRequires: python3
|
||||||
|
BuildRequires: systemtap-sdt-devel
|
||||||
|
BuildRequires: tar
|
||||||
|
BuildRequires: zlib-devel
|
||||||
|
|
||||||
|
%description
|
||||||
|
.NET Core is a fast, lightweight and modular platform for creating
|
||||||
|
cross platform applications that work on Linux, macOS and Windows.
|
||||||
|
|
||||||
|
It particularly focuses on creating console applications, web
|
||||||
|
applications and micro-services.
|
||||||
|
|
||||||
|
.NET Core contains a runtime conforming to .NET Standards a set of
|
||||||
|
framework libraries, an SDK containing compilers and a 'dotnet'
|
||||||
|
application to drive everything.
|
||||||
|
|
||||||
|
|
||||||
|
%package -n dotnet
|
||||||
|
|
||||||
|
Version: %{sdk_rpm_version}
|
||||||
|
Summary: .NET Core CLI tools and runtime
|
||||||
|
|
||||||
|
Requires: dotnet-sdk-3.1%{?_isa} >= %{sdk_rpm_version}-%{release}
|
||||||
|
|
||||||
|
%description -n dotnet
|
||||||
|
.NET Core is a fast, lightweight and modular platform for creating
|
||||||
|
cross platform applications that work on Linux, macOS and Windows.
|
||||||
|
|
||||||
|
It particularly focuses on creating console applications, web
|
||||||
|
applications and micro-services.
|
||||||
|
|
||||||
|
.NET Core contains a runtime conforming to .NET Standards a set of
|
||||||
|
framework libraries, an SDK containing compilers and a 'dotnet'
|
||||||
|
application to drive everything.
|
||||||
|
|
||||||
|
|
||||||
|
%package -n dotnet-host
|
||||||
|
|
||||||
|
Version: %{host_rpm_version}
|
||||||
|
Summary: .NET command line launcher
|
||||||
|
|
||||||
|
%description -n dotnet-host
|
||||||
|
The .NET Core host is a command line program that runs a standalone
|
||||||
|
.NET core application or launches the SDK.
|
||||||
|
|
||||||
|
.NET Core is a fast, lightweight and modular platform for creating
|
||||||
|
cross platform applications that work on Linux, Mac and Windows.
|
||||||
|
|
||||||
|
It particularly focuses on creating console applications, web
|
||||||
|
applications and micro-services.
|
||||||
|
|
||||||
|
|
||||||
|
%package -n dotnet-hostfxr-3.1
|
||||||
|
|
||||||
|
Version: %{host_rpm_version}
|
||||||
|
Summary: .NET Core command line host resolver
|
||||||
|
|
||||||
|
# Theoretically any version of the host should work. But lets aim for the one
|
||||||
|
# provided by this package, or from a newer version of .NET Core
|
||||||
|
Requires: dotnet-host%{?_isa} >= %{host_rpm_version}-%{release}
|
||||||
|
|
||||||
|
%description -n dotnet-hostfxr-3.1
|
||||||
|
The .NET Core host resolver contains the logic to resolve and select
|
||||||
|
the right version of the .NET Core SDK or runtime to use.
|
||||||
|
|
||||||
|
.NET Core is a fast, lightweight and modular platform for creating
|
||||||
|
cross platform applications that work on Linux, Mac and Windows.
|
||||||
|
|
||||||
|
It particularly focuses on creating console applications, web
|
||||||
|
applications and micro-services.
|
||||||
|
|
||||||
|
|
||||||
|
%package -n dotnet-runtime-3.1
|
||||||
|
|
||||||
|
Version: %{runtime_rpm_version}
|
||||||
|
Summary: NET Core 3.1 runtime
|
||||||
|
|
||||||
|
Requires: dotnet-hostfxr-3.1%{?_isa} >= %{host_rpm_version}-%{release}
|
||||||
|
|
||||||
|
# libicu is dlopen()ed
|
||||||
|
Requires: libicu%{?_isa}
|
||||||
|
|
||||||
|
%if %{use_bundled_libunwind}
|
||||||
|
Provides: bundled(libunwind) = 1.3
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%description -n dotnet-runtime-3.1
|
||||||
|
The .NET Core runtime contains everything needed to run .NET Core applications.
|
||||||
|
It includes a high performance Virtual Machine as well as the framework
|
||||||
|
libraries used by .NET Core applications.
|
||||||
|
|
||||||
|
.NET Core is a fast, lightweight and modular platform for creating
|
||||||
|
cross platform applications that work on Linux, Mac and Windows.
|
||||||
|
|
||||||
|
It particularly focuses on creating console applications, web
|
||||||
|
applications and micro-services.
|
||||||
|
|
||||||
|
|
||||||
|
%package -n aspnetcore-runtime-3.1
|
||||||
|
|
||||||
|
Version: %{aspnetcore_runtime_rpm_version}
|
||||||
|
Summary: ASP.NET Core 3.1 runtime
|
||||||
|
|
||||||
|
Requires: dotnet-runtime-3.1%{?_isa} >= %{runtime_rpm_version}-%{release}
|
||||||
|
|
||||||
|
%description -n aspnetcore-runtime-3.1
|
||||||
|
The ASP.NET Core runtime contains everything needed to run .NET Core
|
||||||
|
web applications. It includes a high performance Virtual Machine as
|
||||||
|
well as the framework libraries used by .NET Core applications.
|
||||||
|
|
||||||
|
ASP.NET Core is a fast, lightweight and modular platform for creating
|
||||||
|
cross platform web applications that work on Linux, Mac and Windows.
|
||||||
|
|
||||||
|
It particularly focuses on creating console applications, web
|
||||||
|
applications and micro-services.
|
||||||
|
|
||||||
|
|
||||||
|
%package -n dotnet-templates-3.1
|
||||||
|
|
||||||
|
Version: %{sdk_rpm_version}
|
||||||
|
Summary: .NET Core 3.1 templates
|
||||||
|
|
||||||
|
# Theoretically any version of the host should work. But lets aim for the one
|
||||||
|
# provided by this package, or from a newer version of .NET Core
|
||||||
|
Requires: dotnet-host%{?_isa} >= %{host_rpm_version}-%{release}
|
||||||
|
|
||||||
|
%description -n dotnet-templates-3.1
|
||||||
|
This package contains templates used by the .NET Core SDK.
|
||||||
|
|
||||||
|
ASP.NET Core is a fast, lightweight and modular platform for creating
|
||||||
|
cross platform web applications that work on Linux, Mac and Windows.
|
||||||
|
|
||||||
|
It particularly focuses on creating console applications, web
|
||||||
|
applications and micro-services.
|
||||||
|
|
||||||
|
|
||||||
|
%package -n dotnet-sdk-3.1
|
||||||
|
|
||||||
|
Version: %{sdk_rpm_version}
|
||||||
|
Summary: .NET Core 3.1 Software Development Kit
|
||||||
|
|
||||||
|
Provides: bundled(js-jquery)
|
||||||
|
Provides: bundled(npm)
|
||||||
|
|
||||||
|
Requires: dotnet-runtime-3.1%{?_isa} >= %{runtime_rpm_version}-%{release}
|
||||||
|
Requires: aspnetcore-runtime-3.1%{?_isa} >= %{aspnetcore_runtime_rpm_version}-%{release}
|
||||||
|
|
||||||
|
Requires: dotnet-apphost-pack-3.1%{?_isa} >= %{runtime_rpm_version}-%{release}
|
||||||
|
Requires: dotnet-targeting-pack-3.1%{?_isa} >= %{runtime_rpm_version}-%{release}
|
||||||
|
Requires: aspnetcore-targeting-pack-3.1%{?_isa} >= %{aspnetcore_runtime_rpm_version}-%{release}
|
||||||
|
Requires: netstandard-targeting-pack-2.1%{?_isa} >= %{sdk_rpm_version}-%{release}
|
||||||
|
|
||||||
|
Requires: dotnet-templates-3.1%{?_isa} >= %{sdk_rpm_version}-%{release}
|
||||||
|
|
||||||
|
%description -n dotnet-sdk-3.1
|
||||||
|
The .NET Core SDK is a collection of command line applications to
|
||||||
|
create, build, publish and run .NET Core applications.
|
||||||
|
|
||||||
|
.NET Core is a fast, lightweight and modular platform for creating
|
||||||
|
cross platform applications that work on Linux, Mac and Windows.
|
||||||
|
|
||||||
|
It particularly focuses on creating console applications, web
|
||||||
|
applications and micro-services.
|
||||||
|
|
||||||
|
|
||||||
|
%global dotnet_targeting_pack() %{expand:
|
||||||
|
%package -n %{1}
|
||||||
|
|
||||||
|
Version: %{2}
|
||||||
|
Summary: Targeting Pack for %{3} %{4}
|
||||||
|
|
||||||
|
Requires: dotnet-host%{?_isa}
|
||||||
|
|
||||||
|
%description -n %{1}
|
||||||
|
This package provides a targeting pack for %{3} %{4}
|
||||||
|
that allows developers to compile against and target %{3} %{4}
|
||||||
|
applications using the .NET Core SDK.
|
||||||
|
|
||||||
|
%files -n %{1}
|
||||||
|
%dir %{_libdir}/dotnet/packs
|
||||||
|
%{_libdir}/dotnet/packs/%{5}
|
||||||
|
}
|
||||||
|
|
||||||
|
%dotnet_targeting_pack dotnet-apphost-pack-3.1 %{runtime_rpm_version} Microsoft.NETCore.App 3.1 Microsoft.NETCore.App.Host.%{runtime_id}
|
||||||
|
%dotnet_targeting_pack dotnet-targeting-pack-3.1 %{runtime_rpm_version} Microsoft.NETCore.App 3.1 Microsoft.NETCore.App.Ref
|
||||||
|
%dotnet_targeting_pack aspnetcore-targeting-pack-3.1 %{aspnetcore_runtime_rpm_version} Microsoft.AspNetCore.App 3.1 Microsoft.AspNetCore.App.Ref
|
||||||
|
%dotnet_targeting_pack netstandard-targeting-pack-2.1 %{sdk_rpm_version} NETStandard.Library 2.1 NETStandard.Library.Ref
|
||||||
|
|
||||||
|
|
||||||
|
%package -n dotnet-sdk-3.1-source-built-artifacts
|
||||||
|
|
||||||
|
Version: %{sdk_rpm_version}
|
||||||
|
Summary: Internal package for building .NET Core 3.1 Software Development Kit
|
||||||
|
|
||||||
|
%description -n dotnet-sdk-3.1-source-built-artifacts
|
||||||
|
The .NET Core source-built archive is a collection of packages needed
|
||||||
|
to build the .NET Core SDK itself.
|
||||||
|
|
||||||
|
These are not meant for general use.
|
||||||
|
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q -n dotnet-v%{src_version}-SDK
|
||||||
|
|
||||||
|
%if %{without bootstrap}
|
||||||
|
# Remove all prebuilts
|
||||||
|
find -iname '*.dll' -type f -delete
|
||||||
|
find -iname '*.so' -type f -delete
|
||||||
|
find -iname '*.tar.gz' -type f -delete
|
||||||
|
find -iname '*.nupkg' -type f -delete
|
||||||
|
find -iname '*.zip' -type f -delete
|
||||||
|
rm -rf .dotnet/
|
||||||
|
rm -rf packages/source-built
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{without bootstrap}
|
||||||
|
sed -i -e 's|3.1.100-preview1-014459|3.1.103|' global.json
|
||||||
|
mkdir -p packages/archive
|
||||||
|
ln -s %{_libdir}/dotnet/source-built-artifacts/*.tar.gz packages/archive/
|
||||||
|
ln -s %{_libdir}/dotnet/reference-packages/Private.SourceBuild.ReferencePackages*.tar.gz packages/archive
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# Fix bad hardcoded path in build
|
||||||
|
sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/core-setup.*/src/corehost/common/pal.unix.cpp
|
||||||
|
|
||||||
|
# Disable warnings
|
||||||
|
sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.proj
|
||||||
|
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
|
pushd src/corefx.*
|
||||||
|
%patch100 -p1
|
||||||
|
%patch101 -p1
|
||||||
|
%patch102 -p1
|
||||||
|
%patch103 -p1
|
||||||
|
%patch104 -p1
|
||||||
|
popd
|
||||||
|
|
||||||
|
pushd src/coreclr.*
|
||||||
|
%patch200 -p1
|
||||||
|
#%%patch201 -p1
|
||||||
|
#%%patch202 -p1
|
||||||
|
popd
|
||||||
|
|
||||||
|
pushd src/core-setup.*
|
||||||
|
%patch300 -p1
|
||||||
|
%patch301 -p1
|
||||||
|
popd
|
||||||
|
|
||||||
|
pushd src/cli.*
|
||||||
|
%patch500 -p1
|
||||||
|
popd
|
||||||
|
|
||||||
|
|
||||||
|
# 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>|$(BuildArguments) cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE</BuildArguments>|' repos/coreclr.common.props
|
||||||
|
|
||||||
|
%if %{use_bundled_libunwind}
|
||||||
|
sed -i 's|-DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|-DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=FALSE|' repos/coreclr.common.props
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%ifnarch x86_64
|
||||||
|
mkdir -p artifacts/obj/%{runtime_arch}/Release
|
||||||
|
cp artifacts/obj/x64/Release/PackageVersions.props artifacts/obj/%{runtime_arch}/Release/PackageVersions.props
|
||||||
|
%endif
|
||||||
|
|
||||||
|
cat source-build-info.txt
|
||||||
|
|
||||||
|
find -iname 'nuget.config' -exec echo {}: \; -exec cat {} \; -exec echo \;
|
||||||
|
|
||||||
|
|
||||||
|
%build
|
||||||
|
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
|
||||||
|
|
||||||
|
# .NET Core 3.1 doesn't (yet) know about RHEL 9, so lets hack the RHEL
|
||||||
|
# 9 RID into there, for now. This hack can be removed when the 3.1.112
|
||||||
|
# SDK is available in the buildroot.
|
||||||
|
%if 0%{?rhel} == 9
|
||||||
|
find -iname RuntimeIdentifierGraph.json
|
||||||
|
cat $(find -iname RuntimeIdentifierGraph.json)
|
||||||
|
sed -i -e 's|rhel.8|rhel.9|g' $(find -iname RuntimeIdentifierGraph.json)
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?fedora} > 32 || 0%{?rhel} > 8
|
||||||
|
# Setting this macro ensures that only clang supported options will be
|
||||||
|
# added to ldflags and cflags.
|
||||||
|
%global toolchain clang
|
||||||
|
%set_build_flags
|
||||||
|
%else
|
||||||
|
# Filter flags not supported by clang
|
||||||
|
# -specs=
|
||||||
|
%global dotnet_cflags %(echo %optflags | sed -re 's/-specs=[^ ]*//g')
|
||||||
|
%global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g')
|
||||||
|
export CFLAGS="%{dotnet_cflags}"
|
||||||
|
export CXXFLAGS="%{dotnet_cflags}"
|
||||||
|
export LDFLAGS="%{dotnet_ldflags}"
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%ifarch aarch64
|
||||||
|
# mbranch-protection=standard breaks unwinding in CoreCLR through libunwind
|
||||||
|
CFLAGS=$(echo $CFLAGS | sed -e 's/-mbranch-protection=standard //')
|
||||||
|
CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/-mbranch-protection=standard //')
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# fstack-clash-protection breaks CoreCLR
|
||||||
|
CFLAGS=$(echo $CFLAGS | sed -e 's/-fstack-clash-protection//' )
|
||||||
|
CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/-fstack-clash-protection//' )
|
||||||
|
|
||||||
|
echo $CFLAGS
|
||||||
|
echo $CXXFLAGS
|
||||||
|
echo $LDFLAGS
|
||||||
|
|
||||||
|
#%%if %%{without bootstrap}
|
||||||
|
# --with-ref-packages %%{_libdir}/dotnet/reference-packages/ \
|
||||||
|
# --with-packages %%{_libdir}/dotnet/source-built-artifacts/*.tar.gz \
|
||||||
|
# --with-sdk %%{_libdir}/dotnet \
|
||||||
|
#%%endif
|
||||||
|
|
||||||
|
VERBOSE=1 ./build.sh \
|
||||||
|
%if %{without bootstrap}
|
||||||
|
--with-sdk previously-built-dotnet \
|
||||||
|
%endif
|
||||||
|
-- \
|
||||||
|
/v:n \
|
||||||
|
/p:SkipPortableRuntimeBuild=true \
|
||||||
|
/p:LogVerbosity=n \
|
||||||
|
/p:MinimalConsoleLogOutput=false \
|
||||||
|
/p:ContinueOnPrebuiltBaselineError=true \
|
||||||
|
|
||||||
|
|
||||||
|
sed -e 's|[@]LIBDIR[@]|%{_libdir}|g' %{SOURCE2} > dotnet.sh
|
||||||
|
|
||||||
|
|
||||||
|
%install
|
||||||
|
install -dm 0755 %{buildroot}%{_libdir}/dotnet
|
||||||
|
ls artifacts/%{runtime_arch}/Release
|
||||||
|
tar xf artifacts/%{runtime_arch}/Release/dotnet-sdk-%{sdk_version}-%{runtime_id}.tar.gz -C %{buildroot}%{_libdir}/dotnet/
|
||||||
|
|
||||||
|
# Install managed symbols
|
||||||
|
tar xf artifacts/%{runtime_arch}/Release/runtime/dotnet-runtime-symbols-%{runtime_version}-%{runtime_id}.tar.gz \
|
||||||
|
-C %{buildroot}/%{_libdir}/dotnet/shared/Microsoft.NETCore.App/%{runtime_version}/
|
||||||
|
|
||||||
|
# Fix executable permissions on files
|
||||||
|
find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.dll' -exec chmod -x {} \;
|
||||||
|
find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.pdb' -exec chmod -x {} \;
|
||||||
|
find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.props' -exec chmod -x {} \;
|
||||||
|
find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.pubxml' -exec chmod -x {} \;
|
||||||
|
find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.targets' -exec chmod -x {} \;
|
||||||
|
chmod 0755 %{buildroot}/%{_libdir}/dotnet/sdk/%{sdk_version}/AppHostTemplate/apphost
|
||||||
|
chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/libnethost.so
|
||||||
|
chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/apphost
|
||||||
|
chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/nethost.h
|
||||||
|
|
||||||
|
install -dm 0755 %{buildroot}%{_sysconfdir}/profile.d/
|
||||||
|
install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
# 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 -dm 0755 %{buildroot}%{_bindir}
|
||||||
|
ln -s ../../%{_libdir}/dotnet/dotnet %{buildroot}%{_bindir}/
|
||||||
|
|
||||||
|
install -dm 0755 %{buildroot}%{_mandir}/man1/
|
||||||
|
find -iname 'dotnet*.1' -type f -exec cp {} %{buildroot}%{_mandir}/man1/ \;
|
||||||
|
|
||||||
|
echo "%{_libdir}/dotnet" >> install_location
|
||||||
|
install -dm 0755 %{buildroot}%{_sysconfdir}/dotnet
|
||||||
|
install install_location %{buildroot}%{_sysconfdir}/dotnet/
|
||||||
|
|
||||||
|
install -dm 0755 %{buildroot}%{_libdir}/dotnet/source-built-artifacts
|
||||||
|
install artifacts/%{runtime_arch}/Release/Private.SourceBuilt.Artifacts.*.tar.gz %{buildroot}/%{_libdir}/dotnet/source-built-artifacts/
|
||||||
|
|
||||||
|
# Check debug symbols in all elf objects. This is not in %%check
|
||||||
|
# because native binaries are stripped by rpm-build after %%install.
|
||||||
|
# So we need to do this check earlier.
|
||||||
|
echo "Testing build results for debug symbols..."
|
||||||
|
%{SOURCE1} -v %{buildroot}%{_libdir}/dotnet/
|
||||||
|
|
||||||
|
|
||||||
|
%check
|
||||||
|
%{buildroot}%{_libdir}/dotnet/dotnet --info
|
||||||
|
|
||||||
|
|
||||||
|
%files -n dotnet
|
||||||
|
# empty package useful for dependencies
|
||||||
|
|
||||||
|
%files -n dotnet-host
|
||||||
|
%dir %{_libdir}/dotnet
|
||||||
|
%{_libdir}/dotnet/dotnet
|
||||||
|
%dir %{_libdir}/dotnet/host
|
||||||
|
%dir %{_libdir}/dotnet/host/fxr
|
||||||
|
%{_bindir}/dotnet
|
||||||
|
%license %{_libdir}/dotnet/LICENSE.txt
|
||||||
|
%license %{_libdir}/dotnet/ThirdPartyNotices.txt
|
||||||
|
%doc %{_mandir}/man1/dotnet*.1.gz
|
||||||
|
%{_sysconfdir}/profile.d/dotnet.sh
|
||||||
|
%{_sysconfdir}/dotnet
|
||||||
|
%dir %{_datadir}/bash-completion
|
||||||
|
%dir %{_datadir}/bash-completion/completions
|
||||||
|
%{_datadir}/bash-completion/completions/dotnet
|
||||||
|
|
||||||
|
%files -n dotnet-hostfxr-3.1
|
||||||
|
%dir %{_libdir}/dotnet/host/fxr
|
||||||
|
%{_libdir}/dotnet/host/fxr/%{host_version}
|
||||||
|
|
||||||
|
%files -n dotnet-runtime-3.1
|
||||||
|
%dir %{_libdir}/dotnet/shared
|
||||||
|
%dir %{_libdir}/dotnet/shared/Microsoft.NETCore.App
|
||||||
|
%{_libdir}/dotnet/shared/Microsoft.NETCore.App/%{runtime_version}
|
||||||
|
|
||||||
|
%files -n aspnetcore-runtime-3.1
|
||||||
|
%dir %{_libdir}/dotnet/shared
|
||||||
|
%dir %{_libdir}/dotnet/shared/Microsoft.AspNetCore.App
|
||||||
|
%{_libdir}/dotnet/shared/Microsoft.AspNetCore.App/%{aspnetcore_runtime_version}
|
||||||
|
|
||||||
|
%files -n dotnet-templates-3.1
|
||||||
|
%dir %{_libdir}/dotnet/templates
|
||||||
|
%{_libdir}/dotnet/templates/%{templates_version}
|
||||||
|
|
||||||
|
%files -n dotnet-sdk-3.1
|
||||||
|
%dir %{_libdir}/dotnet/sdk
|
||||||
|
%{_libdir}/dotnet/sdk/%{sdk_version}
|
||||||
|
%dir %{_libdir}/dotnet/packs
|
||||||
|
|
||||||
|
%files -n dotnet-sdk-3.1-source-built-artifacts
|
||||||
|
%dir %{_libdir}/dotnet
|
||||||
|
%{_libdir}/dotnet/source-built-artifacts
|
||||||
|
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Wed Feb 17 2021 Omair Majid <omajid@redhat.com> - 3.1.112-3
|
||||||
|
- Hack an RID for RHEL 9 into the build SDK
|
||||||
|
|
||||||
|
* Wed Feb 17 2021 Omair Majid <omajid@redhat.com> - 3.1.112-2
|
||||||
|
- Add Fedora 35 Runtime ID
|
||||||
|
|
||||||
|
* Fri Feb 12 2021 Omair Majid <omajid@redhat.com> - 3.1.112-1
|
||||||
|
- Update to .NET Core SDK 3.1.112 and Runtime 3.1.12
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.111-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 15 2021 Omair Majid <omajid@redhat.com> - 3.1.111-1
|
||||||
|
- Update to .NET Core SDK 3.1.111 and Runtime 3.1.11
|
||||||
|
|
||||||
|
* Sun Dec 06 2020 Jeff Law <law@redhat.com> - 3.1.110-2
|
||||||
|
- Fix missing #include for gcc-11
|
||||||
|
|
||||||
|
* Tue Nov 10 2020 Omair Majid <omajid@redhat.com> - 3.1.110-1
|
||||||
|
- Update to .NET Core SDK 3.1.110 and Runtime 3.1.10
|
||||||
|
|
||||||
|
* Wed Oct 14 2020 Omair Majid <omajid@redhat.com> - 3.1.109-1
|
||||||
|
- Update to .NET Core SDK 3.1.109 and Runtime 3.1.9
|
||||||
|
|
||||||
|
* Mon Sep 21 2020 Tom Stellard <tstellar@redhat.com> - 3.1.108-2
|
||||||
|
- Use toolchain macro for setting clang-specific c/ld flags
|
||||||
|
|
||||||
|
* Wed Sep 16 2020 Troy Dawson <tdawson@redhat.com> - 3.1.108-1
|
||||||
|
- Generate runtime_id the same way that it does in the various build scripts
|
||||||
|
|
||||||
|
* Fri Sep 11 2020 Omair Majid <omajid@redhat.com> - 3.1.108-1
|
||||||
|
- Update to .NET Core SDK 3.1.108 and Runtime 3.1.8
|
||||||
|
|
||||||
|
* Wed Sep 09 2020 Omair Majid <omajid@redhat.com> - 3.1.107-1
|
||||||
|
- Add Fedora 34 RID
|
||||||
|
- Fix build of bundled libunwind
|
||||||
|
|
||||||
|
* Wed Aug 19 2020 Omair Majid <omajid@redhat.com> - 3.1.107-1
|
||||||
|
- Update to .NET Core Runtime 3.1.7 and SDK 3.1.107
|
||||||
|
|
||||||
|
* Thu Aug 13 2020 Omair Majid <omajid@redhat.com> - 3.1.106-3
|
||||||
|
- Filter out -mbranch-protection=standard from cflags
|
||||||
|
|
||||||
|
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.106-3
|
||||||
|
- Second attempt - Rebuilt for
|
||||||
|
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.106-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 21 2020 Jo Shields <joshield@microsoft.com> - 3.1.106-1
|
||||||
|
- Update to .NET Core Runtime 3.1.6 and SDK 3.1.106
|
||||||
|
|
||||||
|
* Tue Jul 21 2020 Omair Majid <omajid@redhat.com> - 3.1.105-5
|
||||||
|
- Fix up commented-out define for disabling LTO
|
||||||
|
|
||||||
|
* Mon Jul 20 2020 Jeff Law <law@redhat.com> - 3.1.105-5
|
||||||
|
- Disable LTO
|
||||||
|
|
||||||
|
* Sat Jun 27 2020 Omair Majid <omajid@redhat.com> - 3.1.105-4
|
||||||
|
- Disable bootstrap
|
||||||
|
|
||||||
|
* Fri Jun 26 2020 Omair Majid <omajid@redhat.com> - 3.1.105-3
|
||||||
|
- Re-bootstrap aarch64
|
||||||
|
|
||||||
|
* Fri Jun 19 2020 Omair Majid <omajid@redhat.com> - 3.1.105-3
|
||||||
|
- Disable bootstrap
|
||||||
|
|
||||||
|
* Thu Jun 18 2020 Omair Majid <omajid@redhat.com> - 3.1.105-1
|
||||||
|
- Bootstrap aarch64
|
||||||
|
|
||||||
|
* Tue Jun 16 2020 Chris Rummel <crummel@microsoft.com> - 3.1.105-1
|
||||||
|
- Update to .NET Core Runtime 3.1.5 and SDK 3.1.105
|
||||||
|
|
||||||
|
* Fri Jun 05 2020 Chris Rummel <crummel@microsoft.com> - 3.1.104-1
|
||||||
|
- Update to .NET Core Runtime 3.1.4 and SDK 3.1.104
|
||||||
|
|
||||||
|
* Thu Apr 09 2020 Chris Rummel <crummel@microsoft.com> - 3.1.103-1
|
||||||
|
- Update to .NET Core Runtime 3.1.3 and SDK 3.1.103
|
||||||
|
|
||||||
|
* Mon Mar 16 2020 Omair Majid <omajid@redhat.com> - 3.1.102-1
|
||||||
|
- Update to .NET Core Runtime 3.1.2 and SDK 3.1.102
|
||||||
|
|
||||||
|
* Fri Feb 28 2020 Omair Majid <omajid@redhat.com> - 3.1.101-4
|
||||||
|
- Disable bootstrap
|
||||||
|
|
||||||
|
* Fri Feb 28 2020 Omair Majid <omajid@redhat.com> - 3.1.101-3
|
||||||
|
- Enable bootstrap
|
||||||
|
- Add Fedora 33 runtime ids
|
||||||
|
|
||||||
|
* Thu Feb 27 2020 Omair Majid <omajid@redhat.com> - 3.1.101-2
|
||||||
|
- Disable bootstrap
|
||||||
|
|
||||||
|
* Tue Jan 21 2020 Omair Majid <omajid@redhat.com> - 3.1.101-1
|
||||||
|
- Update to .NET Core Runtime 3.1.1 and SDK 3.1.101
|
||||||
|
|
||||||
|
* Thu Dec 05 2019 Omair Majid <omajid@redhat.com> - 3.1.100-1
|
||||||
|
- Update to .NET Core Runtime 3.1.0 and SDK 3.1.100
|
||||||
|
|
||||||
|
* Mon Nov 18 2019 Omair Majid <omajid@redhat.com> - 3.1.100-0.4.preview3
|
||||||
|
- Fix apphost permissions
|
||||||
|
|
||||||
|
* Fri Nov 15 2019 Omair Majid <omajid@redhat.com> - 3.1.100-0.3.preview3
|
||||||
|
- Update to .NET Core Runtime 3.1.0-preview3.19553.2 and SDK
|
||||||
|
3.1.100-preview3-014645
|
||||||
|
|
||||||
|
* Wed Nov 06 2019 Omair Majid <omajid@redhat.com> - 3.1.100-0.2
|
||||||
|
- Update to .NET Core 3.1 Preview 2
|
||||||
|
|
||||||
|
* Wed Oct 30 2019 Omair Majid <omajid@redhat.com> - 3.1.100-0.1
|
||||||
|
- Update to .NET Core 3.1 Preview 1
|
||||||
|
|
||||||
|
* Thu Oct 24 2019 Omair Majid <omajid@redhat.com> - 3.0.100-5
|
||||||
|
- Add cgroupv2 support to .NET Core
|
||||||
|
|
||||||
|
* Wed Oct 16 2019 Omair Majid <omajid@redhat.com> - 3.0.100-4
|
||||||
|
- Include fix from coreclr for building on Fedora 32
|
||||||
|
|
||||||
|
* Wed Oct 16 2019 Omair Majid <omajid@redhat.com> - 3.0.100-3
|
||||||
|
- Harden built binaries to pass annocheck
|
||||||
|
|
||||||
|
* Fri Oct 11 2019 Omair Majid <omajid@redhat.com> - 3.0.100-2
|
||||||
|
- Export DOTNET_ROOT in profile to make apphost lookup work
|
||||||
|
|
||||||
|
* Fri Sep 27 2019 Omair Majid <omajid@redhat.com> - 3.0.100-1
|
||||||
|
- Update to .NET Core Runtime 3.0.0 and SDK 3.0.100
|
||||||
|
|
||||||
|
* Wed Sep 25 2019 Omair Majid <omajid@redhat.com> - 3.0.100-0.18.rc1
|
||||||
|
- Update to .NET Core Runtime 3.0.0-rc1-19456-20 and SDK 3.0.100-rc1-014190
|
||||||
|
|
||||||
|
* Tue Sep 17 2019 Omair Majid <omajid@redhat.com> - 3.0.100-0.16.preview9
|
||||||
|
- Fix files duplicated between dotnet-apphost-pack-3.0 and dotnet-targeting-pack-3.0
|
||||||
|
- Fix dependencies between .NET SDK and the targeting packs
|
||||||
|
|
||||||
|
* Mon Sep 16 2019 Omair Majid <omajid@redhat.com> - 3.0.100-0.15.preview9
|
||||||
|
- Update to .NET Core Runtime 3.0.0-preview 9 and SDK 3.0.100-preview9
|
||||||
|
|
||||||
|
* Mon Aug 19 2019 Omair Majid <omajid@redhat.com> - 3.0.100-0.11.preview8
|
||||||
|
- Update to .NET Core Runtime 3.0.0-preview8-28405-07 and SDK
|
||||||
|
3.0.100-preview8-013656
|
||||||
|
|
||||||
|
* Tue Jul 30 2019 Omair Majid <omajid@redhat.com> - 3.0.100-0.9.preview7
|
||||||
|
- Update to .NET Core Runtime 3.0.0-preview7-27912-14 and SDK
|
||||||
|
3.0.100-preview7-012821
|
||||||
|
|
||||||
|
* Fri Jul 26 2019 Omair Majid <omajid@redhat.com> - 3.0.100-0.8.preview7
|
||||||
|
- Update to .NET Core Runtime 3.0.0-preview7-27902-19 and SDK
|
||||||
|
3.0.100-preview7-012802
|
||||||
|
|
||||||
|
* Wed Jun 26 2019 Omair Majid <omajid@redhat.com> - 3.0.0-0.7.preview6
|
||||||
|
- Obsolete dotnet-sdk-3.0.1xx
|
||||||
|
- Add supackages for targeting packs
|
||||||
|
- Add -fcf-protection to CFLAGS
|
||||||
|
|
||||||
|
* Wed Jun 26 2019 Omair Majid <omajid@redhat.com> - 3.0.0-0.6.preview6
|
||||||
|
- Update to .NET Core Runtime 3.0.0-preview6-27804-01 and SDK 3.0.100-preview6-012264
|
||||||
|
- Set dotnet installation location in /etc/dotnet/install_location
|
||||||
|
- Update targeting packs
|
||||||
|
- Install managed symbols
|
||||||
|
- Completely conditionalize libunwind bundling
|
||||||
|
|
||||||
|
* Tue May 07 2019 Omair Majid <omajid@redhat.com> - 3.0.0-0.3.preview4
|
||||||
|
- Update to .NET Core 3.0 preview 4
|
||||||
|
|
||||||
|
* Tue Dec 18 2018 Omair Majid <omajid@redhat.com> - 3.0.0-0.1.preview1
|
||||||
|
- Update to .NET Core 3.0 preview 1
|
||||||
|
|
||||||
|
* Fri Dec 07 2018 Omair Majid <omajid@redhat.com> - 2.2.100
|
||||||
|
- Update to .NET Core 2.2.0
|
||||||
|
|
||||||
|
* Wed Nov 07 2018 Omair Majid <omajid@redhat.com> - 2.2.100-0.2.preview3
|
||||||
|
- Update to .NET Core 2.2.0-preview3
|
||||||
|
|
||||||
|
* Fri Nov 02 2018 Omair Majid <omajid@redhat.com> - 2.1.403-3
|
||||||
|
- Add host-fxr-2.1 subpackage
|
||||||
|
|
||||||
|
* Mon Oct 15 2018 Omair Majid <omajid@redhat.com> - 2.1.403-2
|
||||||
|
- Disable telemetry by default
|
||||||
|
- Users have to manually export DOTNET_CLI_TELEMETRY_OPTOUT=0 to enable
|
||||||
|
|
||||||
|
* Tue Oct 02 2018 Omair Majid <omajid@redhat.com> - 2.1.403-1
|
||||||
|
- Update to .NET Core Runtime 2.1.5 and SDK 2.1.403
|
||||||
|
|
||||||
|
* Wed Sep 26 2018 Omair Majid <omajid@redhat.com> - 2.1.402-2
|
||||||
|
- Add ~/.dotnet/tools to $PATH to make it easier to use dotnet tools
|
||||||
|
|
||||||
|
* Thu Sep 13 2018 Omair Majid <omajid@redhat.com> - 2.1.402-1
|
||||||
|
- Update to .NET Core Runtime 2.1.4 and SDK 2.1.402
|
||||||
|
|
||||||
|
* Wed Sep 05 2018 Omair Majid <omajid@redhat.com> - 2.1.401-2
|
||||||
|
- Use distro-standard flags when building .NET Core
|
||||||
|
|
||||||
|
* Tue Aug 21 2018 Omair Majid <omajid@redhat.com> - 2.1.401-1
|
||||||
|
- Update to .NET Core Runtime 2.1.3 and SDK 2.1.401
|
||||||
|
|
||||||
|
* Mon Aug 20 2018 Omair Majid <omajid@redhat.com> - 2.1.302-1
|
||||||
|
- Update to .NET Core Runtime 2.1.2 and SDK 2.1.302
|
||||||
|
|
||||||
|
* Fri Jul 20 2018 Omair Majid <omajid@redhat.com> - 2.1.301-1
|
||||||
|
- Update to .NET Core 2.1
|
||||||
|
|
||||||
|
* Thu May 03 2018 Omair Majid <omajid@redhat.com> - 2.0.7-1
|
||||||
|
- Update to .NET Core 2.0.7
|
||||||
|
|
||||||
|
* Wed Mar 28 2018 Omair Majid <omajid@redhat.com> - 2.0.6-2
|
||||||
|
- Enable bash completion for dotnet
|
||||||
|
- Remove redundant buildrequires and requires
|
||||||
|
|
||||||
|
* Wed Mar 14 2018 Omair Majid <omajid@redhat.com> - 2.0.6-1
|
||||||
|
- Update to .NET Core 2.0.6
|
||||||
|
|
||||||
|
* Fri Feb 23 2018 Omair Majid <omajid@redhat.com> - 2.0.5-1
|
||||||
|
- Update to .NET Core 2.0.5
|
||||||
|
|
||||||
|
* Wed Jan 24 2018 Omair Majid <omajid@redhat.com> - 2.0.3-5
|
||||||
|
- Don't apply corefx clang warnings fix on clang < 5
|
||||||
|
|
||||||
|
* Fri Jan 19 2018 Omair Majid <omajid@redhat.com> - 2.0.3-4
|
||||||
|
- Add a test script to sanity check debug and symbol info.
|
||||||
|
- Build with clang 5.0
|
||||||
|
- Make main package real instead of using a virtual provides (see RHBZ 1519325)
|
||||||
|
|
||||||
|
* Wed Nov 29 2017 Omair Majid <omajid@redhat.com> - 2.0.3-3
|
||||||
|
- Add a Provides for 'dotnet'
|
||||||
|
- Fix conditional macro
|
||||||
|
|
||||||
|
* Tue Nov 28 2017 Omair Majid <omajid@redhat.com> - 2.0.3-2
|
||||||
|
- Fix build on Fedora 27
|
||||||
|
|
||||||
|
* Fri Nov 17 2017 Omair Majid <omajid@redhat.com> - 2.0.3-1
|
||||||
|
- Update to .NET Core 2.0.3
|
||||||
|
|
||||||
|
* Thu Oct 19 2017 Omair Majid <omajid@redhat.com> - 2.0.0-4
|
||||||
|
- Add a hack to let omnisharp work
|
||||||
|
|
||||||
|
* Wed Aug 30 2017 Omair Majid <omajid@redhat.com> - 2.0.0-3
|
||||||
|
- Add a patch for building coreclr and core-setup correctly on Fedora >= 27
|
||||||
|
|
||||||
|
* Fri Aug 25 2017 Omair Majid <omajid@redhat.com> - 2.0.0-2
|
||||||
|
- Move libicu/libcurl/libunwind requires to runtime package
|
||||||
|
- Make sdk depend on the exact version of the runtime package
|
||||||
|
|
||||||
|
* Thu Aug 24 2017 Omair Majid <omajid@redhat.com> - 2.0.0-1
|
||||||
|
- Update to 2.0.0 final release
|
||||||
|
|
||||||
|
* Wed Jul 26 2017 Omair Majid <omajid@redhat.com> - 2.0.0-0.3.preview2
|
||||||
|
- Add man pages
|
||||||
|
|
||||||
|
* Tue Jul 25 2017 Omair Majid <omajid@redhat.com> - 2.0.0-0.2.preview2
|
||||||
|
- Add Requires on libicu
|
||||||
|
- Split into multiple packages
|
||||||
|
- Do not repeat first-run message
|
||||||
|
|
||||||
|
* Fri Jul 21 2017 Omair Majid <omajid@redhat.com> - 2.0.0-0.1.preview2
|
||||||
|
- Update to .NET Core 2.0 Preview 2
|
||||||
|
|
||||||
|
* Thu Mar 16 2017 Nemanja Milošević <nmilosevnm@gmail.com> - 1.1.0-7
|
||||||
|
- rebuilt with latest libldb
|
||||||
|
* Wed Feb 22 2017 Nemanja Milosevic <nmilosev@fedoraproject.org> - 1.1.0-6
|
||||||
|
- compat-openssl 1.0 for F26 for now
|
||||||
|
* Sun Feb 19 2017 Nemanja Milosevic <nmilosev@fedoraproject.org> - 1.1.0-5
|
||||||
|
- Fix wrong commit id's
|
||||||
|
* Sat Feb 18 2017 Nemanja Milosevic <nmilosev@fedoraproject.org> - 1.1.0-4
|
||||||
|
- Use commit id's instead of branch names
|
||||||
|
* Sat Feb 18 2017 Nemanja Milosevic <nmilosev@fedoraproject.org> - 1.1.0-3
|
||||||
|
- Improper patch5 fix
|
||||||
|
* Sat Feb 18 2017 Nemanja Milosevic <nmilosev@fedoraproject.org> - 1.1.0-2
|
||||||
|
- SPEC cleanup
|
||||||
|
- git removal (using all tarballs for reproducible builds)
|
||||||
|
- more reasonable versioning
|
||||||
|
* Thu Feb 09 2017 Nemanja Milosevic <nmilosev@fedoraproject.org> - 1.1.0-1
|
||||||
|
- Fixed debuginfo going to separate package (Patch1)
|
||||||
|
- Added F25/F26 RIL and fixed the version info (Patch2)
|
||||||
|
- Added F25/F26 RIL in Microsoft.NETCore.App suported runtime graph (Patch3)
|
||||||
|
- SPEC file cleanup
|
||||||
|
* Wed Jan 11 2017 Nemanja Milosevic <nmilosev@fedoraproject.org> - 1.1.0-0
|
||||||
|
- Initial RPM for Fedora 25/26.
|
||||||
|
|
21
source-build-warnings-are-not-errors.patch
Normal file
21
source-build-warnings-are-not-errors.patch
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
From c82976fd5eb4cbcf67faaba62f0bc59634d30338 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Chris Rummel <crummel@microsoft.com>
|
||||||
|
Date: Fri, 14 Aug 2020 15:34:07 -0500
|
||||||
|
Subject: [PATCH] Disable XLiff warning as error
|
||||||
|
|
||||||
|
---
|
||||||
|
repos/xliff-tasks.proj | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/repos/xliff-tasks.proj b/repos/xliff-tasks.proj
|
||||||
|
index da2ae79c5b..9b86754018 100644
|
||||||
|
--- a/repos/xliff-tasks.proj
|
||||||
|
+++ b/repos/xliff-tasks.proj
|
||||||
|
@@ -7,6 +7,7 @@
|
||||||
|
<BuildCommandArgs>$(BuildCommandArgs) /v:$(LogVerbosity)</BuildCommandArgs>
|
||||||
|
<BuildCommandArgs>$(BuildCommandArgs) /flp:Verbosity=Diag</BuildCommandArgs>
|
||||||
|
<BuildCommandArgs>$(BuildCommandArgs) /bl</BuildCommandArgs>
|
||||||
|
+ <BuildCommandArgs>$(BuildCommandArgs) /p:TreatWarningsAsErrors=false</BuildCommandArgs>
|
||||||
|
<BuildCommandArgs>$(BuildCommandArgs) $(RedirectRepoOutputToLog)</BuildCommandArgs>
|
||||||
|
|
||||||
|
<BuildCommand>$(DotnetToolCommand) $(BuildCommandArgs)</BuildCommand>
|
Loading…
Add table
Reference in a new issue