[arch-commits] Commit in dotnet-core/repos/community-x86_64 (6 files)

Maxime Gauduin alucryd at archlinux.org
Sun Mar 22 19:21:09 UTC 2020


    Date: Sunday, March 22, 2020 @ 19:21:08
  Author: alucryd
Revision: 603608

archrelease: copy trunk to community-x86_64

Added:
  dotnet-core/repos/community-x86_64/9999-Add-arch-RIDs.patch
    (from rev 603607, dotnet-core/trunk/9999-Add-arch-RIDs.patch)
  dotnet-core/repos/community-x86_64/9999-Fix-versionless-RID-computation.patch
    (from rev 603607, dotnet-core/trunk/9999-Fix-versionless-RID-computation.patch)
  dotnet-core/repos/community-x86_64/PKGBUILD
    (from rev 603607, dotnet-core/trunk/PKGBUILD)
Deleted:
  dotnet-core/repos/community-x86_64/9999-Add-arch-RIDs.patch
  dotnet-core/repos/community-x86_64/9999-Fix-versionless-RID-computation.patch
  dotnet-core/repos/community-x86_64/PKGBUILD

--------------------------------------------+
 9999-Add-arch-RIDs.patch                   |  182 +++++++++----------
 9999-Fix-versionless-RID-computation.patch |   26 +-
 PKGBUILD                                   |  252 +++++++++++++--------------
 3 files changed, 230 insertions(+), 230 deletions(-)

Deleted: 9999-Add-arch-RIDs.patch
===================================================================
--- 9999-Add-arch-RIDs.patch	2020-03-22 19:21:00 UTC (rev 603607)
+++ 9999-Add-arch-RIDs.patch	2020-03-22 19:21:08 UTC (rev 603608)
@@ -1,91 +0,0 @@
-From c70ef244c862e8e13ff6552ee829e968186e0f45 Mon Sep 17 00:00:00 2001
-From: Omair Majid <omajid at redhat.com>
-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>

Copied: dotnet-core/repos/community-x86_64/9999-Add-arch-RIDs.patch (from rev 603607, dotnet-core/trunk/9999-Add-arch-RIDs.patch)
===================================================================
--- 9999-Add-arch-RIDs.patch	                        (rev 0)
+++ 9999-Add-arch-RIDs.patch	2020-03-22 19:21:08 UTC (rev 603608)
@@ -0,0 +1,91 @@
+From c70ef244c862e8e13ff6552ee829e968186e0f45 Mon Sep 17 00:00:00 2001
+From: Omair Majid <omajid at redhat.com>
+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>

Deleted: 9999-Fix-versionless-RID-computation.patch
===================================================================
--- 9999-Fix-versionless-RID-computation.patch	2020-03-22 19:21:00 UTC (rev 603607)
+++ 9999-Fix-versionless-RID-computation.patch	2020-03-22 19:21:08 UTC (rev 603608)
@@ -1,13 +0,0 @@
-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

Copied: dotnet-core/repos/community-x86_64/9999-Fix-versionless-RID-computation.patch (from rev 603607, dotnet-core/trunk/9999-Fix-versionless-RID-computation.patch)
===================================================================
--- 9999-Fix-versionless-RID-computation.patch	                        (rev 0)
+++ 9999-Fix-versionless-RID-computation.patch	2020-03-22 19:21:08 UTC (rev 603608)
@@ -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

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-22 19:21:00 UTC (rev 603607)
+++ PKGBUILD	2020-03-22 19:21:08 UTC (rev 603608)
@@ -1,126 +0,0 @@
-# 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=(
- dotnet-host
- dotnet-runtime
- dotnet-sdk
- aspnet-runtime
-)
-pkgver=3.1.2.sdk102
-_runtimever=3.1.2
-_sdkver=3.1.102
-pkgrel=1
-arch=(x86_64)
-url=https://www.microsoft.com/net/core
-license=(MIT)
-makedepends=(
-  clang
-  cmake
-  curl
-  git
-  icu
-  inetutils
-  krb5
-  libgit2
-  libunwind
-  lldb
-  llvm
-  lttng-ust
-  openssl
-  zlib
-)
-options=(staticlibs)
-source=(
-  dotnet-source-build::git+https://github.com/dotnet/source-build.git#tag=e5d3faa5b374e75fea8185a88eee52540c6f2342
-  9999-Fix-versionless-RID-computation.patch
-  9999-Add-arch-RIDs.patch
-)
-sha256sums=('SKIP'
-            '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() {
-  cd dotnet-source-build
-
-  export SOURCE_BUILD_SKIP_SUBMODULE_CHECK=1
-
-  ./build.sh
-}
-
-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}"/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() {
-  pkgdesc='The .NET Core runtime'
-  depends=(
-    dotnet-host
-    glibc
-    icu
-    krb5
-    libcurl.so
-    libunwind
-    openssl
-    zlib
-  )
-
-  optdepends=('lttng-ust: CoreCLR tracing')
-  provides=(dotnet-runtime-3.1)
-  conflicts=(dotnet-runtime-3.1)
-
-  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.NETCore.App
-  ln -s dotnet-host "${pkgdir}"/usr/share/licenses/dotnet-runtime
-}
-
-package_dotnet-sdk() {
-  pkgdesc='The .NET Core SDK'
-  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}"/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
-}
-
-package_aspnet-runtime() {
-  pkgdesc='The ASP.NET Core runtime'
-  depends=(dotnet-runtime)
-  provides=(aspnet-runtime-3.1)
-  conflicts=(aspnet-runtime-3.1)
-
-  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
-}
-
-# vim: ts=2 sw=2 et:

Copied: dotnet-core/repos/community-x86_64/PKGBUILD (from rev 603607, dotnet-core/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-03-22 19:21:08 UTC (rev 603608)
@@ -0,0 +1,126 @@
+# 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=(
+ dotnet-host
+ dotnet-runtime
+ dotnet-sdk
+ aspnet-runtime
+)
+pkgver=3.1.3.sdk103
+_runtimever=3.1.3
+_sdkver=3.1.103
+pkgrel=1
+arch=(x86_64)
+url=https://www.microsoft.com/net/core
+license=(MIT)
+makedepends=(
+  clang
+  cmake
+  curl
+  git
+  icu
+  inetutils
+  krb5
+  libgit2
+  libunwind
+  lldb
+  llvm
+  lttng-ust
+  openssl
+  zlib
+)
+options=(staticlibs)
+source=(
+  dotnet-source-build::git+https://github.com/dotnet/source-build.git#tag=9678feff10e08406d11aee34ff33d409de915902
+  9999-Fix-versionless-RID-computation.patch
+  9999-Add-arch-RIDs.patch
+)
+sha256sums=('SKIP'
+            '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() {
+  cd dotnet-source-build
+
+  export SOURCE_BUILD_SKIP_SUBMODULE_CHECK=1
+
+  ./build.sh
+}
+
+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}"/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() {
+  pkgdesc='The .NET Core runtime'
+  depends=(
+    dotnet-host
+    glibc
+    icu
+    krb5
+    libcurl.so
+    libunwind
+    openssl
+    zlib
+  )
+
+  optdepends=('lttng-ust: CoreCLR tracing')
+  provides=(dotnet-runtime-3.1)
+  conflicts=(dotnet-runtime-3.1)
+
+  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.NETCore.App
+  ln -s dotnet-host "${pkgdir}"/usr/share/licenses/dotnet-runtime
+}
+
+package_dotnet-sdk() {
+  pkgdesc='The .NET Core SDK'
+  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}"/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
+}
+
+package_aspnet-runtime() {
+  pkgdesc='The ASP.NET Core runtime'
+  depends=(dotnet-runtime)
+  provides=(aspnet-runtime-3.1)
+  conflicts=(aspnet-runtime-3.1)
+
+  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
+}
+
+# vim: ts=2 sw=2 et:



More information about the arch-commits mailing list