From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/k3s/
Date: Sat, 19 Mar 2022 18:01:29 +0000 (UTC) [thread overview]
Message-ID: <1647712885.3bcce32317e64e002e9f2816e76576c9287e081b.zmedico@gentoo> (raw)
commit: 3bcce32317e64e002e9f2816e76576c9287e081b
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 17:56:46 2022 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 18:01:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bcce323
sys-cluster/k3s: patch for go-1.18
Closes: https://bugs.gentoo.org/835601
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
sys-cluster/k3s/k3s-1.23.4_p1.ebuild | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sys-cluster/k3s/k3s-1.23.4_p1.ebuild b/sys-cluster/k3s/k3s-1.23.4_p1.ebuild
index 9416158cb176..6475669db7f5 100644
--- a/sys-cluster/k3s/k3s-1.23.4_p1.ebuild
+++ b/sys-cluster/k3s/k3s-1.23.4_p1.ebuild
@@ -54,6 +54,10 @@ src_prepare() {
local CONTAINERD_DIR=build/src/github.com/containerd/containerd
mkdir -p "${CONTAINERD_DIR}" || die
tar -x --strip-components=1 -f "${DISTDIR}/k3s-containerd-${K3S_CONTAINERD_VERSION}.tar.gz" -C "${CONTAINERD_DIR}" || die
+ if has_version -b ">=dev-lang/go-1.18"; then
+ # https://bugs.gentoo.org/835601
+ sed -i -e "/github.com\/containerd\/containerd => .\/.empty-mod/d" "${CONTAINERD_DIR}"/{go.mod,vendor/modules.txt} || die
+ fi
local RUNC_DIR=build/src/github.com/opencontainers/runc
mkdir -p "${RUNC_DIR}" || die
next reply other threads:[~2022-03-19 18:01 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-19 18:01 Zac Medico [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-01-29 20:34 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/k3s/ William Hubbs
2022-12-11 21:13 Zac Medico
2022-11-19 1:03 Zac Medico
2022-10-26 0:17 Zac Medico
2022-10-10 15:51 Zac Medico
2022-09-30 1:33 Zac Medico
2022-09-30 1:33 Zac Medico
2022-09-14 2:30 Zac Medico
2022-08-26 20:30 Zac Medico
2022-08-26 20:30 Zac Medico
2022-07-24 22:26 Zac Medico
2022-07-10 17:35 Zac Medico
2022-07-10 17:35 Zac Medico
2022-07-02 1:05 Zac Medico
2022-06-12 22:50 Zac Medico
2022-06-12 22:32 Zac Medico
2022-06-12 22:10 Zac Medico
2022-04-30 1:59 Zac Medico
2022-04-01 17:43 Zac Medico
2022-03-19 17:27 Zac Medico
2022-02-26 20:22 Zac Medico
2022-02-21 21:06 Zac Medico
2022-02-16 22:09 Zac Medico
2022-01-31 1:25 Zac Medico
2022-01-16 0:20 Zac Medico
2022-01-10 14:29 Zac Medico
2022-01-09 22:38 Zac Medico
2021-12-19 2:48 Zac Medico
2021-12-19 2:47 Zac Medico
2021-12-19 1:33 Zac Medico
2021-12-19 1:04 Zac Medico
2021-12-11 21:09 Zac Medico
2021-11-04 7:03 Zac Medico
2021-11-04 6:31 Zac Medico
2021-11-04 5:35 Zac Medico
2021-11-04 5:07 Zac Medico
2021-10-13 3:37 Zac Medico
2021-10-13 3:33 Zac Medico
2021-10-13 3:33 Zac Medico
2021-10-13 3:33 Zac Medico
2021-10-12 21:05 Zac Medico
2021-10-12 7:16 Zac Medico
2021-10-12 6:53 Zac Medico
2021-10-12 5:55 Zac Medico
2021-10-12 5:52 Zac Medico
2021-10-12 5:21 Zac Medico
2021-10-12 4:35 Zac Medico
2021-10-05 4:05 Zac Medico
2021-05-10 5:57 Zac Medico
2021-05-02 8:57 Zac Medico
2021-05-02 7:19 Zac Medico
2021-05-02 6:25 Zac Medico
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1647712885.3bcce32317e64e002e9f2816e76576c9287e081b.zmedico@gentoo \
--to=zmedico@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox