[arch-commits] Commit in dotnet-core/trunk (5 files)

Maxime Gauduin alucryd at archlinux.org
Tue Dec 17 17:28:10 UTC 2019


    Date: Tuesday, December 17, 2019 @ 17:28:10
  Author: alucryd
Revision: 537937

upgpkg: dotnet-core 3.1.0.sdk100-1

Added:
  dotnet-core/trunk/9999-Fix-versionless-RID-computation.patch
Modified:
  dotnet-core/trunk/PKGBUILD
Deleted:
  dotnet-core/trunk/dotnet-coreclr-dbghelpers.patch
  dotnet-core/trunk/dotnet-coreclr-rid.patch
  dotnet-core/trunk/dotnet.sh

--------------------------------------------+
 9999-Fix-versionless-RID-computation.patch |   13 ++
 PKGBUILD                                   |  138 +++++++--------------------
 dotnet-coreclr-dbghelpers.patch            |   44 --------
 dotnet-coreclr-rid.patch                   |   38 -------
 dotnet.sh                                  |    6 -
 5 files changed, 50 insertions(+), 189 deletions(-)

Added: 9999-Fix-versionless-RID-computation.patch
===================================================================
--- 9999-Fix-versionless-RID-computation.patch	                        (rev 0)
+++ 9999-Fix-versionless-RID-computation.patch	2019-12-17 17:28:10 UTC (rev 537937)
@@ -0,0 +1,13 @@
+diff --git a/src/corehost/build.sh b/src/corehost/build.sh
+index fb503e74..9a6ec590 100755
+--- a/src/corehost/build.sh
++++ b/src/corehost/build.sh
+@@ -25,7 +25,7 @@ init_rid_plat()
+                 # remove the last version number
+                 VERSION_ID=${VERSION_ID%.*}
+             fi
+-            __rid_plat="$ID.$VERSION_ID"
++            __rid_plat="$ID${VERSION_ID:+.$VERSION_ID}"
+             if [[ "$ID" == "alpine" ]]; then
+                 __rid_plat="linux-musl"
+             fi

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-17 17:27:05 UTC (rev 537936)
+++ PKGBUILD	2019-12-17 17:28:10 UTC (rev 537937)
@@ -1,5 +1,6 @@
 # Maintainer: Maxime Gauduin <alucryd at archlinux.org>
 # Contributor: Max Liebkies <mail at maxliebkies.de>
+# Contributor: Krzysztof Bogacki <krzysztof.bogacki at leancode.pl>
 
 pkgbase=dotnet-core
 pkgname=(
@@ -8,7 +9,9 @@
  dotnet-sdk
  aspnet-runtime
 )
-pkgver=2.2.6+108
+pkgver=3.1.0.sdk100
+_runtimever=3.1.0
+_sdkver=3.1.100
 pkgrel=1
 arch=(x86_64)
 url=https://www.microsoft.com/net/core
@@ -21,105 +24,32 @@
   icu
   inetutils
   krb5
+  libgit2
   libunwind
   lldb
   llvm
   lttng-ust
-  openssl-1.0
+  openssl
   zlib
 )
 options=(staticlibs)
 source=(
-  dotnet-source-build::git+https://github.com/dotnet/source-build.git#tag=v${pkgver%+*}
-  dotnet-application-insights::git+https://github.com/Microsoft/ApplicationInsights-dotnet.git
-  dotnet-arcade::git+https://github.com/dotnet/arcade.git
-  dotnet-aspnet-razor::git+https://github.com/aspnet/Razor.git
-  dotnet-cecil::git+https://github.com/mono/cecil.git
-  dotnet-cli::git+https://github.com/dotnet/cli.git
-  dotnet-cli-migrate::git+https://github.com/dotnet/cli-migrate.git
-  dotnet-clicommandlineparser::git+https://github.com/dotnet/clicommandlineparser.git
-  dotnet-common::git+https://github.com/aspnet/common.git
-  dotnet-core-setup::git+https://github.com/dotnet/core-setup.git
-  dotnet-coreclr::git+https://github.com/dotnet/coreclr.git
-  dotnet-corefx::git+https://github.com/dotnet/corefx.git
-  dotnet-fsharp::git+https://github.com/Microsoft/VisualFSharp.git
-  dotnet-linker::git+https://github.com/mono/linker.git
-  dotnet-msbuild::git+https://github.com/Microsoft/msbuild.git
-  dotnet-newtonsoft-json::git+https://github.com/JamesNK/Newtonsoft.Json.git
-  dotnet-nuget-client::git+https://github.com/NuGet/NuGet.Client.git
-  dotnet-roslyn::git+https://github.com/dotnet/roslyn.git
-  dotnet-roslyn-tools::git+https://github.com/dotnet/roslyn-tools.git
-  dotnet-sdk::git+https://github.com/dotnet/sdk.git
-  dotnet-standard::git+https://github.com/dotnet/standard.git
-  dotnet-templating::git+https://github.com/dotnet/templating.git
-  dotnet-vstest::git+https://github.com/Microsoft/vstest.git
-  dotnet-websdk::git+https://github.com/aspnet/websdk.git
-  dotnet-xliff-tasks::git+https://github.com/dotnet/xliff-tasks.git
-  https://download.visualstudio.microsoft.com/download/pr/5d59077f-07f3-4997-b514-d88bce8cdcbf/3729ac370c4b96720829e098bee7ee5e/aspnetcore-runtime-2.2.6-linux-x64.tar.gz
-  dotnet.sh
-  dotnet-coreclr-rid.patch
-  dotnet-coreclr-dbghelpers.patch
+  dotnet-source-build::git+https://github.com/dotnet/source-build.git#tag=4e9ce2915ba680d38b47a2dadd74ec3b52a09d1b
+  9999-Fix-versionless-RID-computation.patch
 )
 sha256sums=('SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            '1e5687ab1b52fc342211607af829d847b96976737f187394b468d27b9f3ae7af'
-            '4978b3a31a94032b425d2a2a9b5a17f506f36fb784fbfefdf2cfea9485a30f47'
-            '2c4fc48151e5319d57c8761091709070a17da91eddc2de8a26bc32c60679bfee'
-            '6a8da7d7e19efdabaae07b668cfefe8f7e8dc62239f0d70e03f34ae6bf79e645')
+            '0e500cd3d1e4a75bf58558020f1b6ad7720f9194dfea2aade7c148af5a031cd7')
 
 prepare() {
   cd dotnet-source-build
 
-  for submodule in src/{application-insights,arcade,aspnet-razor,cli,cli-migrate,clicommandlineparser,common,core-setup,coreclr,corefx,fsharp,linker,msbuild,newtonsoft-json,nuget-client,roslyn,roslyn-tools,sdk,standard,templating,vstest,websdk,xliff-tasks}; do
-    git submodule init ${submodule}
-    git config submodule.${submodule}.url ../dotnet-${submodule#src/}
-    git submodule update
-  done
-
-  cd src/linker
-
-  for submodule in cecil; do
-    git submodule init ${submodule}
-    git config submodule.${submodule}.url ../../../dotnet-${submodule}
-    git submodule update
-  done
-
-  cd ../coreclr
-
-  git cherry-pick -n bdd0408f25a285deae0a69da659f4bc4d4f272f7
-  patch -Np1 -i "${srcdir}"/dotnet-coreclr-dbghelpers.patch
-  patch -Np1 -i "${srcdir}"/dotnet-coreclr-rid.patch
+  cp ../9999-Fix-versionless-RID-computation.patch patches/core-setup/
 }
 
 build() {
   cd dotnet-source-build
 
-  export PKG_CONFIG_PATH='/usr/lib/openssl-1.0/pkgconfig'
   export SOURCE_BUILD_SKIP_SUBMODULE_CHECK=1
-  export CXXFLAGS="$CXXFLAGS -Wno-atomic-implicit-seq-cst"
 
   ./build.sh
 }
@@ -126,14 +56,15 @@
 
 package_dotnet-host() {
   pkgdesc='A generic driver for the .NET Core Command Line Interface'
+  depends=(glibc)
 
   cd dotnet-source-build/bin/x64/Release
 
-  install -dm 755 "${pkgdir}"/{opt/dotnet,usr/share/licenses/dotnet-host}
-  tar -C "${pkgdir}"/opt/dotnet -xf dotnet-sdk-${pkgver/[0-9]\+}-linux-x64.tar.gz ./dotnet ./host
-  tar -C "${pkgdir}"/usr/share/licenses/dotnet-host -xf dotnet-sdk-${pkgver/[0-9]\+}-linux-x64.tar.gz ./LICENSE.txt ./ThirdPartyNotices.txt
-  chown root:root -R "${pkgdir}"/opt/dotnet
-  install -Dm 755 "${srcdir}"/dotnet.sh "${pkgdir}"/usr/bin/dotnet
+  install -dm 755 "${pkgdir}"/usr/{bin,lib,share/{dotnet,licenses/dotnet-host}}
+  bsdtar -xf dotnet-sdk-${_sdkver}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner dotnet host
+  bsdtar -xf dotnet-sdk-${_sdkver}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/licenses/dotnet-host/ --no-same-owner LICENSE.txt ThirdPartyNotices.txt
+  ln -s /usr/share/dotnet/dotnet "${pkgdir}"/usr/bin/dotnet
+  ln -s /usr/share/dotnet/host/fxr/${_runtimever}/libhostfxr.so "${pkgdir}"/usr/lib/libhostfxr.so
 }
 
 package_dotnet-runtime() {
@@ -140,36 +71,39 @@
   pkgdesc='The .NET Core runtime'
   depends=(
     dotnet-host
+    glibc
     icu
     krb5
     libcurl.so
     libunwind
-    openssl-1.0
+    openssl
     zlib
   )
+
   optdepends=('lttng-ust: CoreCLR tracing')
-  provides=(dotnet-runtime-2.2)
-  conflicts=(dotnet-runtime-2.2)
+  provides=(dotnet-runtime-3.1)
+  conflicts=(dotnet-runtime-3.1)
 
   cd dotnet-source-build/bin/x64/Release
 
-  install -dm 755 "${pkgdir}"/{opt/dotnet,usr/share/licenses}
-  tar -C "${pkgdir}"/opt/dotnet -xf dotnet-sdk-${pkgver/[0-9]\+}-linux-x64.tar.gz ./shared
-  chown root:root -R "${pkgdir}"/opt/dotnet
+  install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
+  bsdtar -xf dotnet-sdk-${_sdkver}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner shared/Microsoft.NETCore.App
   ln -s dotnet-host "${pkgdir}"/usr/share/licenses/dotnet-runtime
 }
 
 package_dotnet-sdk() {
   pkgdesc='The .NET Core SDK'
-  depends=(dotnet-runtime)
-  provides=(dotnet-sdk-2.2)
-  conflicts=(dotnet-sdk-2.2)
+  depends=(
+    dotnet-runtime
+    glibc
+  )
+  provides=(dotnet-sdk-3.1)
+  conflicts=(dotnet-sdk-3.1)
 
   cd dotnet-source-build/bin/x64/Release
 
-  install -dm 755 "${pkgdir}"/{opt/dotnet,usr/share/licenses}
-  tar -C "${pkgdir}"/opt/dotnet -xf dotnet-sdk-${pkgver/[0-9]\+}-linux-x64.tar.gz ./sdk
-  chown root:root -R "${pkgdir}"/opt/dotnet
+  install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
+  bsdtar -xf dotnet-sdk-${_sdkver}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner packs sdk templates
   ln -s dotnet-host "${pkgdir}"/usr/share/licenses/dotnet-sdk
 }
 
@@ -176,11 +110,13 @@
 package_aspnet-runtime() {
   pkgdesc='The ASP.NET Core runtime'
   depends=(dotnet-runtime)
-  provides=(aspnet-runtime-2.2)
-  conflicts=(aspnet-runtime-2.2)
+  provides=(aspnet-runtime-3.1)
+  conflicts=(aspnet-runtime-3.1)
 
-  install -dm 755 "${pkgdir}"/{opt/dotnet/shared,usr/share/licenses}
-  cp -dr --no-preserve='ownership' shared/Microsoft.AspNetCore.{All,App} "${pkgdir}"/opt/dotnet/shared/
+  cd dotnet-source-build/bin/x64/Release
+
+  install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
+  bsdtar -xf dotnet-sdk-${_sdkver}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner shared/Microsoft.AspNetCore.App
   ln -s dotnet-host "${pkgdir}"/usr/share/licenses/aspnet-runtime
 }
 

Deleted: dotnet-coreclr-dbghelpers.patch
===================================================================
--- dotnet-coreclr-dbghelpers.patch	2019-12-17 17:27:05 UTC (rev 537936)
+++ dotnet-coreclr-dbghelpers.patch	2019-12-17 17:28:10 UTC (rev 537937)
@@ -1,44 +0,0 @@
-diff --git a/src/debug/ee/amd64/dbghelpers.S b/src/debug/ee/amd64/dbghelpers.S
-index 85ec80c7014f..864c4dc943be 100644
---- a/src/debug/ee/amd64/dbghelpers.S
-+++ b/src/debug/ee/amd64/dbghelpers.S
-@@ -29,7 +29,7 @@ NESTED_ENTRY FuncEvalHijack, _TEXT, UnhandledExceptionHandlerUnix
-         //
-         // epilogue
-         //
--        add     rsp, 20h
-+        add     rsp, 0x20
-         TAILJMP_RAX
- NESTED_END FuncEvalHijack, _TEXT
- 
-@@ -65,14 +65,14 @@ NESTED_ENTRY ExceptionHijack, _TEXT, UnhandledExceptionHandlerUnix
-         // its arguments on the stack. In x64, it gets its arguments in
-         // registers (set up for us by DacDbiInterfaceImpl::Hijack),
-         // and this stack space may be reused.
--        mov     rax, [rsp + 20h]
-+        mov     rax, [rsp + 0x20]
-         mov     [rsp], rax
--        mov     rax, [rsp + 28h]
--        mov     [rsp + 8h], rax
--        mov     rax, [rsp + 30h]
--        mov     [rsp + 10h], rax
--        mov     rax, [rsp + 38h]
--        mov     [rsp + 18h], rax
-+        mov     rax, [rsp + 0x28]
-+        mov     [rsp + 0x8], rax
-+        mov     rax, [rsp + 0x30]
-+        mov     [rsp + 0x10], rax
-+        mov     rax, [rsp + 0x38]
-+        mov     [rsp + 0x18], rax
-         
-         // DD Hijack primitive already set the stack. So just make the call now.
-         call    C_FUNC(ExceptionHijackWorker)
-@@ -93,7 +93,7 @@ NESTED_ENTRY ExceptionHijack, _TEXT, UnhandledExceptionHandlerUnix
-         //
-         // epilogue
-         //
--        add     rsp, 20h
-+        add     rsp, 0x20
-         TAILJMP_RAX
- 
- // Put a label here to tell the debugger where the end of this function is.

Deleted: dotnet-coreclr-rid.patch
===================================================================
--- dotnet-coreclr-rid.patch	2019-12-17 17:27:05 UTC (rev 537936)
+++ dotnet-coreclr-rid.patch	2019-12-17 17:28:10 UTC (rev 537937)
@@ -1,38 +0,0 @@
-diff -rupN dotnet-coreclr.orig/build-packages.sh dotnet-coreclr/build-packages.sh
---- dotnet-coreclr.orig/build-packages.sh	2018-06-21 11:53:45.890536633 +0200
-+++ dotnet-coreclr/build-packages.sh	2018-06-21 11:57:34.508917604 +0200
-@@ -24,6 +24,9 @@ initHostDistroRid()
-             if [[ $ID == "alpine" ]]; then
-                 __HostDistroRid="linux-musl-$__Arch"
-             fi
-+            if [[ $ID == "arch" ]]; then
-+                __HostDistroRid="arch-$__Arch"
-+            fi
-         elif [ -e /etc/redhat-release ]; then
-             local redhatRelease=$(</etc/redhat-release)
-             if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux Server release 6."* ]]; then
-diff -rupN dotnet-coreclr.orig/build.sh dotnet-coreclr/build.sh
---- dotnet-coreclr.orig/build.sh	2018-06-21 11:53:45.890536633 +0200
-+++ dotnet-coreclr/build.sh	2018-06-21 11:56:19.968359087 +0200
-@@ -73,6 +73,9 @@ initHostDistroRid()
-             if [[ $ID == "alpine" ]]; then
-                 __HostDistroRid="linux-musl-$__HostArch"
-             fi
-+            if [[ $ID == "arch" ]]; then
-+                __HostDistroRid="arch-$__HostArch"
-+            fi
-         elif [ -e /etc/redhat-release ]; then
-             local redhatRelease=$(</etc/redhat-release)
-             if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux Server release 6."* ]]; then
-diff -rupN dotnet-coreclr.orig/build-test.sh dotnet-coreclr/build-test.sh
---- dotnet-coreclr.orig/build-test.sh	2018-06-21 11:53:45.890536633 +0200
-+++ dotnet-coreclr/build-test.sh	2018-06-21 11:58:19.189252190 +0200
-@@ -21,6 +21,8 @@ initHostDistroRid()
-             source /etc/os-release
-             if [[ $ID == "alpine" ]]; then
-                 __HostDistroRid="linux-musl-$__HostArch"
-+            elif [[ $ID == "arch" ]]; then
-+                __HostDistroRid="arch-$__HostArch"
-             else
-                 __PortableBuild=1
-                 __HostDistroRid="$ID.$VERSION_ID-$__HostArch"

Deleted: dotnet.sh
===================================================================
--- dotnet.sh	2019-12-17 17:27:05 UTC (rev 537936)
+++ dotnet.sh	2019-12-17 17:28:10 UTC (rev 537937)
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-export DOTNET_ROOT=/opt/dotnet
-exec /opt/dotnet/dotnet "$@"
-
-# vim: ts=2 sw=2 et:


More information about the arch-commits mailing list