[arch-commits] Commit in dotnet-core/trunk (PKGBUILD dotnet-coreclr-rid.patch)

[Maxime Gauduin via arch-commits]

    Date: Wednesday, June 27, 2018 @ 19:52:21
  Author: alucryd
Revision: 346566

upgpkg: dotnet-core 2.1.1+301-1

Added:
  dotnet-core/trunk/dotnet-coreclr-rid.patch
Modified:
  dotnet-core/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   12 +++++-------
 dotnet-coreclr-rid.patch |   38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2018-06-27 19:29:23 UTC (rev 346565)
+++ PKGBUILD    2018-06-27 19:52:21 UTC (rev 346566)
@@ -4,8 +4,7 @@
 
 pkgbase=dotnet-core
 pkgname=('dotnet-host' 'dotnet-runtime' 'aspnet-runtime' 'dotnet-sdk')
-pkgver=2.1.1
-_pkgver_sdk=2.1.301
+pkgver=2.1.1+301
 pkgrel=1
 arch=('x86_64')
 url='https://www.microsoft.com/net/core'
@@ -94,8 +93,8 @@
   cd dotnet-source-build/bin/x64/Release
 
   install -dm 755 
"${pkgdir}"/{opt/dotnet,usr/bin,usr/share/licenses/dotnet-host}
-  tar -C "${pkgdir}"/opt/dotnet -xf dotnet-sdk-${_pkgver_sdk}-linux-x64.tar.gz 
./dotnet ./host
-  tar -C "${pkgdir}"/usr/share/licenses/dotnet-host -xf 
dotnet-sdk-${_pkgver_sdk}-linux-x64.tar.gz ./LICENSE.txt ./ThirdPartyNotices.txt
+  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
   ln -s /opt/dotnet/dotnet "${pkgdir}"/usr/bin/
 }
 
@@ -110,7 +109,7 @@
   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_sdk}-linux-x64.tar.gz 
./shared
+  tar -C "${pkgdir}"/opt/dotnet -xf 
dotnet-sdk-${pkgver/[0-9]\+}-linux-x64.tar.gz ./shared
   ln -s dotnet-host "${pkgdir}"/usr/share/licenses/dotnet-runtime
 }
 
@@ -126,7 +125,6 @@
 }
 
 package_dotnet-sdk() {
-  pkgver=2.1.301
   pkgdesc='The .NET Core SDK'
   depends=('dotnet-runtime')
   provides=('dotnet-sdk-2.1')
@@ -135,7 +133,7 @@
   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_sdk}-linux-x64.tar.gz 
./sdk
+  tar -C "${pkgdir}"/opt/dotnet -xf 
dotnet-sdk-${pkgver/[0-9]\+}-linux-x64.tar.gz ./sdk
   ln -s dotnet-host "${pkgdir}"/usr/share/licenses/dotnet-sdk
 }
 

Added: dotnet-coreclr-rid.patch
===================================================================
--- dotnet-coreclr-rid.patch                            (rev 0)
+++ dotnet-coreclr-rid.patch    2018-06-27 19:52:21 UTC (rev 346566)
@@ -0,0 +1,38 @@
+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"