Date: Friday, January 17, 2020 @ 19:52:34 Author: alucryd Revision: 552903
FS#65128: dotnet-core 3.1.0.sdk100-2 Added: dotnet-core/trunk/9999-Add-arch-RIDs.patch Modified: dotnet-core/trunk/PKGBUILD --------------------------+ 9999-Add-arch-RIDs.patch | 91 +++++++++++++++++++++++++++++++++++++++++++++ PKGBUILD | 9 ++-- 2 files changed, 97 insertions(+), 3 deletions(-) Added: 9999-Add-arch-RIDs.patch =================================================================== --- 9999-Add-arch-RIDs.patch (rev 0) +++ 9999-Add-arch-RIDs.patch 2020-01-17 19:52:34 UTC (rev 552903) @@ -0,0 +1,91 @@ +From c70ef244c862e8e13ff6552ee829e968186e0f45 Mon Sep 17 00:00:00 2001 +From: Omair Majid <[email protected]> +Date: Fri, 8 Nov 2019 21:01:11 -0500 +Subject: [PATCH] Add runtime id for Arch Linux + +Like gentoo, Arch Linux is a rolling release and doesn't have explicit +version numbers. + + $ cat /etc/os-release + NAME="Arch Linux" + PRETTY_NAME="Arch Linux" + ID=arch + BUILD_ID=rolling + ANSI_COLOR="0;36" + HOME_URL="https://www.archlinux.org/"; + DOCUMENTATION_URL="https://wiki.archlinux.org/"; + SUPPORT_URL="https://bbs.archlinux.org/"; + BUG_REPORT_URL="https://bugs.archlinux.org/"; + LOGO=archlinux +--- + .../runtime.compatibility.json | 17 +++++++++++++++++ + .../Microsoft.NETCore.Platforms/runtime.json | 11 +++++++++++ + .../runtimeGroups.props | 5 +++++ + 3 files changed, 33 insertions(+) + +diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json +index 2a196ecc9fc7..d273634527ef 100644 +--- a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json ++++ b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json +@@ -270,6 +270,23 @@ + "any", + "base" + ], ++ "arch": [ ++ "arch", ++ "linux", ++ "unix", ++ "any", ++ "base" ++ ], ++ "arch-x64": [ ++ "arch-x64", ++ "arch", ++ "linux-x64", ++ "linux", ++ "unix-x64", ++ "unix", ++ "any", ++ "base" ++ ], + "base": [ + "base" + ], +diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json +index e70f2da7e668..5b2f70f44b9e 100644 +--- a/pkg/Microsoft.NETCore.Platforms/runtime.json ++++ b/pkg/Microsoft.NETCore.Platforms/runtime.json +@@ -121,6 +121,17 @@ + "any" + ] + }, ++ "arch": { ++ "#import": [ ++ "linux" ++ ] ++ }, ++ "arch-x64": { ++ "#import": [ ++ "arch", ++ "linux-x64" ++ ] ++ }, + "base": { + "#import": [] + }, +diff --git a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props +index 6c95b67819be..aa31cac61f34 100644 +--- a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props ++++ b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props +@@ -25,6 +25,11 @@ + <Versions>21</Versions> + </RuntimeGroup> + ++ <RuntimeGroup Include="arch"> ++ <Parent>linux</Parent> ++ <Architectures>x64</Architectures> ++ </RuntimeGroup> ++ + <RuntimeGroup Include="centos"> + <Parent>rhel</Parent> + <Architectures>x64</Architectures> Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-01-17 19:49:36 UTC (rev 552902) +++ PKGBUILD 2020-01-17 19:52:34 UTC (rev 552903) @@ -12,7 +12,7 @@ pkgver=3.1.0.sdk100 _runtimever=3.1.0 _sdkver=3.1.100 -pkgrel=1 +pkgrel=2 arch=(x86_64) url=https://www.microsoft.com/net/core license=(MIT) @@ -34,16 +34,19 @@ ) options=(staticlibs) source=( - dotnet-source-build::git+https://github.com/dotnet/source-build.git#tag=4e9ce2915ba680d38b47a2dadd74ec3b52a09d1b + dotnet-source-build::git+https://github.com/dotnet/source-build.git#tag= 9999-Fix-versionless-RID-computation.patch + 9999-Add-arch-RIDs.patch ) sha256sums=('SKIP' - '0e500cd3d1e4a75bf58558020f1b6ad7720f9194dfea2aade7c148af5a031cd7') + '0e500cd3d1e4a75bf58558020f1b6ad7720f9194dfea2aade7c148af5a031cd7' + '1d64778c9ac6a5aa49cda743e87ed31ace6aef8aa2e22f98ccd9bb7303cfd593') prepare() { cd dotnet-source-build cp ../9999-Fix-versionless-RID-computation.patch patches/core-setup/ + cp ../9999-Add-arch-RIDs.patch patches/corefx/ } build() {
