summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Maunier2018-12-05 18:11:28 +0100
committerFlorian Maunier2018-12-05 18:11:28 +0100
commitfcab25712f4711bbfd77d4b9832f49e9164f7ce3 (patch)
tree20c968d4875c63ac84ffc07e8c78b8050ca648dd
parent58aeeb2f2e5bec597c50b5766185571c5d4188d3 (diff)
downloadaur-fcab25712f4711bbfd77d4b9832f49e9164f7ce3.tar.gz
use upstream binary release until source-build is fixed
-rw-r--r--.SRCINFO58
-rw-r--r--PKGBUILD119
-rw-r--r--dotnet-coreclr-rid.patch38
3 files changed, 17 insertions, 198 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3777dad0d68..af22a5c6bc4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = dotnet-core-preview
pkgver = 3.0.0+100+preview.009812
- pkgrel = 1
+ pkgrel = 2
url = https://www.microsoft.com/net/core
arch = x86_64
license = MIT
@@ -17,64 +17,12 @@ pkgbase = dotnet-core-preview
makedepends = openssl
makedepends = zlib
options = staticlibs
- source = dotnet-source-build::git+https://github.com/dotnet/source-build.git
- source = dotnet-application-insights::git+https://github.com/Microsoft/ApplicationInsights-dotnet.git
- source = dotnet-aspnet-razor::git+https://github.com/aspnet/Razor.git
- source = dotnet-cecil::git+https://github.com/mono/cecil.git
- source = dotnet-cli::git+https://github.com/dotnet/cli.git
- source = dotnet-cli-migrate::git+https://github.com/dotnet/cli-migrate.git
- source = dotnet-clicommandlineparser::git+https://github.com/dotnet/clicommandlineparser.git
- source = dotnet-common::git+https://github.com/aspnet/common.git
- source = dotnet-core-sdk::git+https://github.com/dotnet/core-sdk.git
- source = dotnet-core-setup::git+https://github.com/dotnet/core-setup.git
- source = dotnet-coreclr::git+https://github.com/dotnet/coreclr.git
- source = dotnet-corefx::git+https://github.com/dotnet/corefx.git
- source = dotnet-fsharp::git+https://github.com/Microsoft/VisualFSharp.git
- source = dotnet-linker::git+https://github.com/mono/linker.git
- source = dotnet-msbuild::git+https://github.com/Microsoft/msbuild.git
- source = dotnet-newtonsoft-json::git+https://github.com/dseefeld/Newtonsoft.Json.git
- source = dotnet-nuget-client::git+https://github.com/NuGet/NuGet.Client.git
- source = dotnet-roslyn::git+https://github.com/dotnet/roslyn.git
- source = dotnet-roslyn-tools::git+https://github.com/dotnet/roslyn-tools.git
- source = dotnet-sdk::git+https://github.com/dotnet/sdk.git
- source = dotnet-standard::git+https://github.com/dotnet/standard.git
- source = dotnet-templating::git+https://github.com/dotnet/templating.git
- source = dotnet-toolset::git+https://github.com/dotnet/toolset.git
- source = dotnet-vstest::git+https://github.com/Microsoft/vstest.git
- source = dotnet-websdk::git+https://github.com/aspnet/websdk.git
- source = dotnet-xliff-tasks::git+https://github.com/dotnet/xliff-tasks.git
+ source = https://download.visualstudio.microsoft.com/download/pr/9f071c35-36b4-48c9-bcc2-b381ecb6cada/5be4784f19c28cb58f8c79219347201a/dotnet-sdk-3.0.100-preview-009812-linux-x64.tar.gz
source = https://download.visualstudio.microsoft.com/download/pr/d5460b29-cab8-43e6-b939-d150f4119e5e/b6269597f778fb9932925d50e6a0b0ed/aspnetcore-runtime-3.0.0-preview-18579-0056-linux-x64.tar.gz
source = dotnet.sh
- source = dotnet-coreclr-rid.patch
- sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = SKIP
+ sha256sums = 6f174c7429338bd5eee7189d3fb17230268e8882e30c9d85e6feeb9d2c42778b
sha256sums = 1efa641bba4fd458136517f31f9719130fc3c733525d98ab152dc2a9639018c1
sha256sums = f4cb02490234b853946477f82514f0c6247b55b08b2e85fae98e99a6e6974edd
- sha256sums = 2c4fc48151e5319d57c8761091709070a17da91eddc2de8a26bc32c60679bfee
pkgname = dotnet-host-preview
pkgdesc = A generic driver for the .NET Core Command Line Interface (preview)
diff --git a/PKGBUILD b/PKGBUILD
index c983ef53580..cf673e5c524 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=dotnet-core-preview
pkgname=('dotnet-host-preview' 'dotnet-runtime-preview' 'aspnet-runtime-preview' 'dotnet-sdk-preview')
pkgver=3.0.0+100+preview.009812
_pkgver=3.0.0+100-preview-009812
-pkgrel=1
+pkgrel=2
arch=('x86_64')
url='https://www.microsoft.com/net/core'
license=('MIT')
@@ -15,107 +15,22 @@ makedepends=(
)
options=('staticlibs')
source=(
- 'dotnet-source-build::git+https://github.com/dotnet/source-build.git'
- 'dotnet-application-insights::git+https://github.com/Microsoft/ApplicationInsights-dotnet.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-sdk::git+https://github.com/dotnet/core-sdk.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/dseefeld/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-toolset::git+https://github.com/dotnet/toolset.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/9f071c35-36b4-48c9-bcc2-b381ecb6cada/5be4784f19c28cb58f8c79219347201a/dotnet-sdk-3.0.100-preview-009812-linux-x64.tar.gz'
'https://download.visualstudio.microsoft.com/download/pr/d5460b29-cab8-43e6-b939-d150f4119e5e/b6269597f778fb9932925d50e6a0b0ed/aspnetcore-runtime-3.0.0-preview-18579-0056-linux-x64.tar.gz'
'dotnet.sh'
- 'dotnet-coreclr-rid.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'
- 'SKIP'
+sha256sums=('6f174c7429338bd5eee7189d3fb17230268e8882e30c9d85e6feeb9d2c42778b'
'1efa641bba4fd458136517f31f9719130fc3c733525d98ab152dc2a9639018c1'
- 'f4cb02490234b853946477f82514f0c6247b55b08b2e85fae98e99a6e6974edd'
- '2c4fc48151e5319d57c8761091709070a17da91eddc2de8a26bc32c60679bfee')
-
-prepare() {
- cd dotnet-source-build
-
- for submodule in src/{application-insights,aspnet-razor,cli,cli-migrate,clicommandlineparser,common,core-sdk,core-setup,coreclr,corefx,fsharp,linker,msbuild,newtonsoft-json,nuget-client,roslyn,roslyn-tools,sdk,standard,templating,toolset,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
-
- patch -Np1 -i "${srcdir}"/dotnet-coreclr-rid.patch
-}
-
-build() {
- cd dotnet-source-build
-
- export SOURCE_BUILD_SKIP_SUBMODULE_CHECK=1
-
- ./build.sh
-}
+ 'f4cb02490234b853946477f82514f0c6247b55b08b2e85fae98e99a6e6974edd')
package_dotnet-host-preview() {
pkgdesc='A generic driver for the .NET Core Command Line Interface (preview)'
provides=('dotnet-host')
conflicts=('dotnet-host')
- 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 "${pkgdir}"/{opt/dotnet,usr/share/licenses/dotnet-host-preview}
+ cp -dr --no-preserve='ownership' dotnet host "${pkgdir}"/opt/dotnet/
+ cp -dr --no-preserve='ownership' LICENSE.txt ThirdPartyNotices.txt "${pkgdir}"/usr/share/licenses/dotnet-host-preview
install -Dm 755 "${srcdir}"/dotnet.sh "${pkgdir}"/usr/bin/dotnet
}
@@ -127,12 +42,9 @@ package_dotnet-runtime-preview() {
provides=('dotnet-runtime-3.0')
conflicts=('dotnet-runtime-3.0')
- 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
- ln -s dotnet-host "${pkgdir}"/usr/share/licenses/dotnet-runtime
+ install -dm 755 "${pkgdir}"/{opt/dotnet/shared,usr/share/licenses}
+ cp -dr --no-preserve='ownership' shared/Microsoft.NETCore.App "${pkgdir}"/opt/dotnet/shared/
+ ln -s dotnet-host-preview "${pkgdir}"/usr/share/licenses/dotnet-runtime-preview
}
package_aspnet-runtime-preview() {
@@ -142,8 +54,8 @@ package_aspnet-runtime-preview() {
conflicts=('aspnet-runtime-3.0')
install -dm 755 "${pkgdir}"/{opt/dotnet/shared,usr/share/licenses}
- cp -dr --no-preserve='ownership' shared/Microsoft.AspNetCore.{All,App} "${pkgdir}"/opt/dotnet/shared/
- ln -s dotnet-host "${pkgdir}"/usr/share/licenses/aspnet-runtime
+ cp -dr --no-preserve='ownership' shared/Microsoft.AspNetCore.App "${pkgdir}"/opt/dotnet/shared/
+ ln -s dotnet-host-preview "${pkgdir}"/usr/share/licenses/aspnet-runtime-preview
}
package_dotnet-sdk-preview() {
@@ -152,12 +64,9 @@ package_dotnet-sdk-preview() {
provides=('dotnet-sdk-3.0')
conflicts=('dotnet-sdk-3.0')
- 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
- ln -s dotnet-host "${pkgdir}"/usr/share/licenses/dotnet-sdk
+ cp -dr --no-preserve='ownership' sdk "${pkgdir}"/opt/dotnet/
+ ln -s dotnet-host-preview "${pkgdir}"/usr/share/licenses/dotnet-sdk-preview
}
# vim: ts=2 sw=2 et:
diff --git a/dotnet-coreclr-rid.patch b/dotnet-coreclr-rid.patch
deleted file mode 100644
index a0b38a7ee92..00000000000
--- a/dotnet-coreclr-rid.patch
+++ /dev/null
@@ -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"