Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: dotnet-5.0.206.1
@ 2021-09-15 17:54 TinfoilSubmarine
  2021-09-15 18:35 ` rmboggs
                   ` (50 more replies)
  0 siblings, 51 replies; 52+ messages in thread
From: TinfoilSubmarine @ 2021-09-15 17:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1990 bytes --]

There is a new pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages dotnet
https://github.com/void-linux/void-packages/pull/32974

New package: dotnet-5.0.206.1
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Supersedes https://github.com/void-linux/void-packages/pull/27170. I followed the [packaging guidelines](https://github.com/dotnet/source-build/blob/v5.0.206.1-SDK/Documentation/packaging-installation.md) in the source-build repo. I aligned with the [recommended packages list here](https://docs.microsoft.com/en-us/dotnet/core/distribution-packaging) minus `dotnet-runtime-deps`.

A patch file from https://github.com/void-linux/void-packages/pull/32974.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dotnet-32974.patch --]
[-- Type: text/x-diff, Size: 12225 bytes --]

From d7c56beb82baa5457f43ef00d8aebf8a40bf0bab Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 7 Sep 2021 17:54:32 -0400
Subject: [PATCH] New package: dotnet-5.0.206.1

---
 srcpkgs/aspnetcore-runtime                    |   1 +
 srcpkgs/aspnetcore-targeting-pack             |   1 +
 srcpkgs/dotnet-apphost-pack                   |   1 +
 srcpkgs/dotnet-host                           |   1 +
 srcpkgs/dotnet-hostfxr                        |   1 +
 srcpkgs/dotnet-runtime                        |   1 +
 srcpkgs/dotnet-sdk                            |   1 +
 srcpkgs/dotnet-targeting-pack                 |   1 +
 srcpkgs/dotnet-templates                      |   1 +
 .../files/9999-runtime-link-order.patch       |  23 +++
 .../files/9999-sdk-telemetry-optout.patch     |  13 ++
 srcpkgs/dotnet/files/dotnet.sh                |   9 +
 srcpkgs/dotnet/template                       | 174 ++++++++++++++++++
 srcpkgs/netstandard-targeting-pack            |   1 +
 14 files changed, 229 insertions(+)
 create mode 120000 srcpkgs/aspnetcore-runtime
 create mode 120000 srcpkgs/aspnetcore-targeting-pack
 create mode 120000 srcpkgs/dotnet-apphost-pack
 create mode 120000 srcpkgs/dotnet-host
 create mode 120000 srcpkgs/dotnet-hostfxr
 create mode 120000 srcpkgs/dotnet-runtime
 create mode 120000 srcpkgs/dotnet-sdk
 create mode 120000 srcpkgs/dotnet-targeting-pack
 create mode 120000 srcpkgs/dotnet-templates
 create mode 100644 srcpkgs/dotnet/files/9999-runtime-link-order.patch
 create mode 100644 srcpkgs/dotnet/files/9999-sdk-telemetry-optout.patch
 create mode 100644 srcpkgs/dotnet/files/dotnet.sh
 create mode 100644 srcpkgs/dotnet/template
 create mode 120000 srcpkgs/netstandard-targeting-pack

diff --git a/srcpkgs/aspnetcore-runtime b/srcpkgs/aspnetcore-runtime
new file mode 120000
index 000000000000..8115f8387cd9
--- /dev/null
+++ b/srcpkgs/aspnetcore-runtime
@@ -0,0 +1 @@
+dotnet
\ No newline at end of file
diff --git a/srcpkgs/aspnetcore-targeting-pack b/srcpkgs/aspnetcore-targeting-pack
new file mode 120000
index 000000000000..8115f8387cd9
--- /dev/null
+++ b/srcpkgs/aspnetcore-targeting-pack
@@ -0,0 +1 @@
+dotnet
\ No newline at end of file
diff --git a/srcpkgs/dotnet-apphost-pack b/srcpkgs/dotnet-apphost-pack
new file mode 120000
index 000000000000..8115f8387cd9
--- /dev/null
+++ b/srcpkgs/dotnet-apphost-pack
@@ -0,0 +1 @@
+dotnet
\ No newline at end of file
diff --git a/srcpkgs/dotnet-host b/srcpkgs/dotnet-host
new file mode 120000
index 000000000000..8115f8387cd9
--- /dev/null
+++ b/srcpkgs/dotnet-host
@@ -0,0 +1 @@
+dotnet
\ No newline at end of file
diff --git a/srcpkgs/dotnet-hostfxr b/srcpkgs/dotnet-hostfxr
new file mode 120000
index 000000000000..8115f8387cd9
--- /dev/null
+++ b/srcpkgs/dotnet-hostfxr
@@ -0,0 +1 @@
+dotnet
\ No newline at end of file
diff --git a/srcpkgs/dotnet-runtime b/srcpkgs/dotnet-runtime
new file mode 120000
index 000000000000..8115f8387cd9
--- /dev/null
+++ b/srcpkgs/dotnet-runtime
@@ -0,0 +1 @@
+dotnet
\ No newline at end of file
diff --git a/srcpkgs/dotnet-sdk b/srcpkgs/dotnet-sdk
new file mode 120000
index 000000000000..8115f8387cd9
--- /dev/null
+++ b/srcpkgs/dotnet-sdk
@@ -0,0 +1 @@
+dotnet
\ No newline at end of file
diff --git a/srcpkgs/dotnet-targeting-pack b/srcpkgs/dotnet-targeting-pack
new file mode 120000
index 000000000000..8115f8387cd9
--- /dev/null
+++ b/srcpkgs/dotnet-targeting-pack
@@ -0,0 +1 @@
+dotnet
\ No newline at end of file
diff --git a/srcpkgs/dotnet-templates b/srcpkgs/dotnet-templates
new file mode 120000
index 000000000000..8115f8387cd9
--- /dev/null
+++ b/srcpkgs/dotnet-templates
@@ -0,0 +1 @@
+dotnet
\ No newline at end of file
diff --git a/srcpkgs/dotnet/files/9999-runtime-link-order.patch b/srcpkgs/dotnet/files/9999-runtime-link-order.patch
new file mode 100644
index 000000000000..c814f99e63f7
--- /dev/null
+++ b/srcpkgs/dotnet/files/9999-runtime-link-order.patch
@@ -0,0 +1,23 @@
+diff --git a/src/installer/corehost/cli/apphost/static/CMakeLists.txt b/src/installer/corehost/cli/apphost/static/CMakeLists.txt
+index a9d5b04..653b356 100644
+--- a/src/installer/corehost/cli/apphost/static/CMakeLists.txt
++++ b/src/installer/corehost/cli/apphost/static/CMakeLists.txt
+@@ -212,14 +212,14 @@ target_link_libraries(
+     libhostcommon
+     ${CORECLR_LIBRARIES}
+ 
+-    ${ZLIB_LIBRARIES}
+-    ${LIBGSS}
+-    ${NATIVE_LIBS_EXTRA}
+-
+     ${START_WHOLE_ARCHIVE}
+     ${RUNTIMEINFO_LIB}
+     ${NATIVE_LIBS}
+     ${END_WHOLE_ARCHIVE}
++
++    ${ZLIB_LIBRARIES}
++    ${LIBGSS}
++    ${NATIVE_LIBS_EXTRA}
+ )
+ 
+ if(NOT FEATURE_DISTRO_AGNOSTIC_SSL)
diff --git a/srcpkgs/dotnet/files/9999-sdk-telemetry-optout.patch b/srcpkgs/dotnet/files/9999-sdk-telemetry-optout.patch
new file mode 100644
index 000000000000..6d4fe2b24125
--- /dev/null
+++ b/srcpkgs/dotnet/files/9999-sdk-telemetry-optout.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Cli/dotnet/Program.cs b/src/Cli/dotnet/Program.cs
+index f811472..26982c0 100644
+--- a/src/Cli/dotnet/Program.cs
++++ b/src/Cli/dotnet/Program.cs
+@@ -187,7 +187,7 @@ internal static int ProcessArgs(string[] args, TimeSpan startupTime, ITelemetry
+                         bool generateAspNetCertificate =
+                             environmentProvider.GetEnvironmentVariableAsBool("DOTNET_GENERATE_ASPNET_CERTIFICATE", defaultValue: true);
+                         bool telemetryOptout =
+-                          environmentProvider.GetEnvironmentVariableAsBool("DOTNET_CLI_TELEMETRY_OPTOUT", defaultValue: false);
++                          environmentProvider.GetEnvironmentVariableAsBool("DOTNET_CLI_TELEMETRY_OPTOUT", defaultValue: true);
+                         bool addGlobalToolsToPath =
+                             environmentProvider.GetEnvironmentVariableAsBool("DOTNET_ADD_GLOBAL_TOOLS_TO_PATH", defaultValue: true);
+                         bool nologo =
diff --git a/srcpkgs/dotnet/files/dotnet.sh b/srcpkgs/dotnet/files/dotnet.sh
new file mode 100644
index 000000000000..c6c4cf36f0ff
--- /dev/null
+++ b/srcpkgs/dotnet/files/dotnet.sh
@@ -0,0 +1,9 @@
+# Set location for AppHost lookup
+[ -z "$DOTNET_ROOT" ] && export DOTNET_ROOT=/usr/lib/dotnet
+
+# Add dotnet tools directory to PATH
+DOTNET_TOOLS_PATH="$HOME/.dotnet/tools"
+case "$PATH" in
+    *"$DOTNET_TOOLS_PATH"* ) true ;;
+    * ) PATH="$PATH:$DOTNET_TOOLS_PATH" ;;
+esac
diff --git a/srcpkgs/dotnet/template b/srcpkgs/dotnet/template
new file mode 100644
index 000000000000..385ff2b68162
--- /dev/null
+++ b/srcpkgs/dotnet/template
@@ -0,0 +1,174 @@
+# Template file for 'dotnet'
+pkgname=dotnet
+version=5.0.206.1
+revision=1
+_tarball_version=5.0.206
+_dotnet_version=5.0.9
+archs="x86_64*"
+wrksrc="source-build-${version}-SDK"
+build_style=meta
+hostmakedepends="git tar wget python3 cmake clang llvm"
+makedepends="icu-devel libunwind-devel lttng-ust-devel zlib-devel mit-krb5-devel"
+depends="dotnet-sdk aspnetcore-runtime dotnet-runtime dotnet-hostfxr dotnet-host
+ dotnet-apphost-pack dotnet-targeting-pack aspnetcore-targeting-pack
+ netstandard-targeting-pack dotnet-templates"
+short_desc=".NET Core components meta package"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://dotnet.microsoft.com"
+distfiles="https://github.com/dotnet/source-build/archive/refs/tags/v${version}-SDK.tar.gz"
+checksum=e531ac5ea818b0c10e945922ee761a0a33ec2389fa112721ea3e1c405461a0de
+nocross=yes
+
+_sdk_commit=a8e1d9cb37e54f08f58fce93af19378607332973
+_runtime_commit=208e377a5329ad6eb1db5e5fb9d4590fa50beadd
+# left as reference; values come from the source tarball
+# _sdk_commit=$(xmllint --xpath \
+# "//Dependency[@Name='Microsoft.NET.Sdk']//*[name()='Sha']/text()" \
+# eng/Version.Details.xml)
+# _runtime_commit=$(xmllint --xpath \
+# "//Dependency[@Name='Microsoft.NETCore.App.Runtime.win-x64']//*[name()='Sha']/text()" \
+# eng/Version.Details.xml)
+
+post_extract() {
+	git init
+}
+
+pre_patch() {
+	cp "${FILESDIR}"/9999-runtime-link-order.patch patches/runtime/
+	cp "${FILESDIR}"/9999-sdk-telemetry-optout.patch patches/sdk/
+	# broken patch; removing fixes building from failing on missing crossgen
+	rm patches/aspnetcore/0001-Use-non-portable-NETCoreAppRuntime-for-crossgen.patch
+}
+
+do_build() {
+	./build.sh \
+	/p:SkipPortableRuntimeBuild=true \
+	/p:UseSystemLibraries=true \
+	/p:UseSystemLibunwind=true
+}
+
+do_install() {
+	cd artifacts/x64/Release
+	bsdtar -xf dotnet-sdk-"${_tarball_version}"-linux-x64.tar.gz
+
+	vmkdir usr/lib/dotnet
+	vcopy dotnet usr/lib/dotnet
+	vcopy host usr/lib/dotnet
+	vcopy packs usr/lib/dotnet
+	vcopy sdk usr/lib/dotnet
+	vcopy shared usr/lib/dotnet
+	vcopy templates usr/lib/dotnet
+
+	vmkdir etc/dotnet
+	echo '/usr/lib/dotnet' > "${DESTDIR}"/etc/dotnet/install_location
+
+	vmkdir etc/profile.d
+	vcopy "${FILESDIR}"/dotnet.sh etc/profile.d
+
+	vmkdir usr/bin
+	ln -s /usr/lib/dotnet/dotnet "${DESTDIR}"/usr/bin/dotnet
+}
+
+dotnet-host_package() {
+	short_desc=".NET Core Command Line Interface"
+	pkg_install() {
+		vmove usr/lib/dotnet/dotnet
+		vmove usr/bin/dotnet
+		vmove etc/dotnet/install_location
+		vmove etc/profile.d/dotnet.sh
+		vcompletion "${wrksrc}"/artifacts/src/sdk."${_sdk_commit}"/scripts/register-completions.bash bash
+		vcompletion "${wrksrc}"/artifacts/src/sdk."${_sdk_commit}"/scripts/register-completions.zsh zsh
+
+		vlicense "${wrksrc}"/artifacts/x64/Release/LICENSE.txt
+		vlicense "${wrksrc}"/artifacts/x64/Release/ThirdPartyNotices.txt
+		# there are 2 dotnet.1 manpages; one in the runtime and one in the sdk. On
+		# closer inspection this one is titled dotnet-cli(1) at the top. sdk
+		# manpages are included here because they are referenced by
+		# dotnet-cli(1).
+		vman "${wrksrc}"/artifacts/src/runtime."${_runtime_commit}"/docs/manpages/host/dotnet.1 dotnet-cli.1
+		for f in "${wrksrc}"/artifacts/src/sdk."${_sdk_commit}"/documentation/manpages/sdk/*.1; do
+			vman $f
+		done
+	}
+}
+
+dotnet-hostfxr_package() {
+	short_desc=".NET Core Command Line Interface"
+	depends="dotnet-host"
+	pkg_install() {
+		vmove usr/lib/dotnet/host/fxr
+		vlicense "${wrksrc}"/artifacts/x64/Release/LICENSE.txt
+	}
+}
+
+dotnet-runtime_package() {
+	short_desc=".NET Core runtime"
+	depends="dotnet-hostfxr"
+	pkg_install() {
+		vmove usr/lib/dotnet/shared/Microsoft.NETCore.App
+		vlicense "${wrksrc}"/artifacts/x64/Release/LICENSE.txt
+	}
+}
+
+aspnetcore-runtime_package() {
+	short_desc="ASP.NET Core runtime"
+	depends="dotnet-runtime"
+	pkg_install() {
+		vmove usr/lib/dotnet/shared/Microsoft.AspNetCore.App
+		vlicense "${wrksrc}"/artifacts/x64/Release/LICENSE.txt
+	}
+}
+
+dotnet-sdk_package() {
+	short_desc=".NET Core SDK"
+	depends="dotnet-runtime aspnetcore-runtime dotnet-targeting-pack
+	 aspnetcore-targeting-pack netstandard-targeting-pack dotnet-apphost-pack
+	 dotnet-templates"
+	pkg_install() {
+		vmove usr/lib/dotnet/sdk
+		vlicense "${wrksrc}"/artifacts/x64/Release/LICENSE.txt
+
+	}
+}
+
+dotnet-apphost-pack_package() {
+	short_desc=".NET Core apphost pack"
+	pkg_install() {
+		vmove usr/lib/dotnet/packs/Microsoft.NETCore.App.Host.linux-x64
+		vlicense "${wrksrc}"/artifacts/x64/Release/LICENSE.txt
+	}
+}
+
+dotnet-targeting-pack_package() {
+	short_desc=".NET Core targeting pack"
+	pkg_install() {
+		vmove usr/lib/dotnet/packs/Microsoft.NETCore.App.Ref
+		vlicense "${wrksrc}"/artifacts/x64/Release/LICENSE.txt
+	}
+}
+
+aspnetcore-targeting-pack_package() {
+	short_desc="ASP.NET Core targeting pack"
+	pkg_install() {
+		vmove usr/lib/dotnet/packs/Microsoft.AspNetCore.App.Ref
+		vlicense "${wrksrc}"/artifacts/x64/Release/LICENSE.txt
+	}
+}
+
+netstandard-targeting-pack_package() {
+	short_desc=".NET Standard targeting pack"
+	pkg_install() {
+		vmove usr/lib/dotnet/packs/NETStandard.Library.Ref
+		vlicense "${wrksrc}"/artifacts/x64/Release/LICENSE.txt
+	}
+}
+
+dotnet-templates_package() {
+	short_desc=".NET Core SDK templates"
+	pkg_install() {
+		vmove usr/lib/dotnet/templates
+		vlicense "${wrksrc}"/artifacts/x64/Release/LICENSE.txt
+
+	}
+}
diff --git a/srcpkgs/netstandard-targeting-pack b/srcpkgs/netstandard-targeting-pack
new file mode 120000
index 000000000000..8115f8387cd9
--- /dev/null
+++ b/srcpkgs/netstandard-targeting-pack
@@ -0,0 +1 @@
+dotnet
\ No newline at end of file

^ permalink raw reply	[flat|nested] 52+ messages in thread

end of thread, other threads:[~2022-12-09  7:30 UTC | newest]

Thread overview: 52+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-15 17:54 [PR PATCH] New package: dotnet-5.0.206.1 TinfoilSubmarine
2021-09-15 18:35 ` rmboggs
2021-09-15 21:48 ` TinfoilSubmarine
2021-09-15 21:50 ` TinfoilSubmarine
2021-09-16 13:20 ` TinfoilSubmarine
2021-09-16 15:51 ` TinfoilSubmarine
2021-09-16 17:53 ` Anachron
2021-09-16 18:04 ` TinfoilSubmarine
2021-09-16 18:45 ` rmboggs
2021-09-16 21:49 ` [PR PATCH] [Updated] " TinfoilSubmarine
2021-09-16 21:51 ` TinfoilSubmarine
2021-09-20 12:18 ` TinfoilSubmarine
2021-09-21 13:25 ` rmboggs
2021-10-09 15:43 ` rmboggs
2021-10-09 15:48 ` TinfoilSubmarine
2021-10-19 14:09 ` TinfoilSubmarine
2021-11-16  3:14 ` jcgruenhage
2022-02-10  4:35 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-02-18 18:15 ` [WIP] New package: dotnet-6.0.100 TinfoilSubmarine
2022-02-18 18:15 ` [PR PATCH] [Closed]: " TinfoilSubmarine
2022-02-19 21:30 ` ayakael
2022-02-27  1:03 ` kawaiiamber
2022-02-27  1:16 ` ayakael
2022-02-27  1:17 ` ayakael
2022-02-27  1:17 ` ayakael
2022-02-27  1:18 ` ayakael
2022-02-27  1:29 ` ayakael
2022-02-27  1:29 ` ayakael
2022-02-27  1:32 ` ayakael
2022-03-01 20:02 ` MichaelSimons
2022-09-27 23:35 ` mjeveritt
2022-09-29  2:54 ` astralchan
2022-09-29  3:05 ` mjeveritt
2022-09-29  3:18 ` ayakael
2022-11-01 23:59 ` rmboggs
2022-11-02  0:31 ` ayakael
2022-11-02  0:45 ` ayakael
2022-11-02  1:14 ` mjeveritt
2022-11-02  1:57 ` ayakael
2022-11-26 17:24 ` rmboggs
2022-11-26 18:29 ` jcgruenhage
2022-11-26 18:59 ` rmboggs
2022-11-26 19:52 ` ayakael
2022-11-26 19:53 ` ayakael
2022-11-26 20:06 ` rmboggs
2022-11-26 20:10 ` ayakael
2022-11-28 17:14 ` ayakael
2022-11-28 18:26 ` JamiKettunen
2022-11-28 19:51 ` rmboggs
2022-11-28 19:53 ` rmboggs
2022-12-03 19:41 ` rmboggs
2022-12-09  7:30 ` rmboggs

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).