Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-dotnet/dotnet-sdk-bin/
Date: Sat, 04 Dec 2021 20:08:04
Message-Id: 1638648468.b8c18f5e5717d32105547c60950e1e4925b797f7.zmedico@gentoo
1 commit: b8c18f5e5717d32105547c60950e1e4925b797f7
2 Author: Andrii Kurdiumov <kant2002 <AT> gmail <DOT> com>
3 AuthorDate: Sat Dec 4 17:31:56 2021 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 4 20:07:48 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8c18f5e
7
8 dev-dotnet/dotnet-sdk-bin: Add workload definition for 6.0.100
9
10 Add /opt/dotnet-sdk-bin-6.0/metadata/workloads/6.0.100/userlocal
11 file which used to indicate which workloads are installed. Without
12 that file Nuget think this is broken installation and attempt to
13 create that file which become a problem for ebuilds which depends
14 on dotnet.
15
16 See: https://github.com/dotnet/sdk/pull/18823#issuecomment-915603684
17 Closes: https://github.com/gentoo/gentoo/pull/23182
18 Closes: https://bugs.gentoo.org/827712
19 Signed-off-by: Andrii Kurdiumov <kant2002 <AT> gmail.com>
20 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
21
22 dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.100.ebuild | 6 ++++++
23 1 file changed, 6 insertions(+)
24
25 diff --git a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.100.ebuild b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.100.ebuild
26 index 8f0c1a6de55f..a52d40cfec34 100644
27 --- a/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.100.ebuild
28 +++ b/dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.100.ebuild
29 @@ -37,6 +37,12 @@ src_install() {
30 local dest="opt/${PN}-${SLOT}"
31 dodir "${dest%/*}"
32
33 + # 6.0.100 is SDK feature band which will not change between minor increases, so 6.0.101, 6.102
34 + # will still have same 6.0.100 SDK feature band in the name. Thus I have to hard code this
35 + # https://github.com/dotnet/sdk/pull/18823#issuecomment-915603684
36 + local workloads="metadata/workloads/${SLOT}.100"
37 +
38 + { mkdir -p "${S}/${workloads}" && touch "${S}/${workloads}/userlocal"; } || die
39 { mv "${S}" "${ED}/${dest}" && mkdir "${S}" && fperms 0755 "/${dest}"; } || die
40 dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}"