Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/k3s/
Date: Tue, 12 Oct 2021 05:55:53
Message-Id: 1634018037.3ea065d5e41b9391d72501db1e56863808de249c.zmedico@gentoo
1 commit: 3ea065d5e41b9391d72501db1e56863808de249c
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 12 05:53:42 2021 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 12 05:53:57 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ea065d5
7
8 sys-cluster/k3s: fix ebuild.minorsyn
9
10 ebuild.minorsyn 1
11 sys-cluster/k3s/k3s-1.19.15.ebuild: line 1472: 'sed' call should be moved to src_prepare
12
13 Package-Manager: Portage-3.0.28, Repoman-3.0.3
14 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
15
16 sys-cluster/k3s/k3s-1.19.15.ebuild | 9 +++++----
17 1 file changed, 5 insertions(+), 4 deletions(-)
18
19 diff --git a/sys-cluster/k3s/k3s-1.19.15.ebuild b/sys-cluster/k3s/k3s-1.19.15.ebuild
20 index 86c414ac83c..d14cbd88c11 100644
21 --- a/sys-cluster/k3s/k3s-1.19.15.ebuild
22 +++ b/sys-cluster/k3s/k3s-1.19.15.ebuild
23 @@ -1465,16 +1465,17 @@ src_unpack() {
24 cp "${DISTDIR}/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz" cache/ || die
25 mv "${WORKDIR}/bin/"* "${S}/bin/" || die
26 mv "${WORKDIR}/etc" "${S}/etc" || die
27 +}
28 +
29 +src_prepare() {
30 + local filename pattern replacement
31 + default
32
33 local RUNC_DIR=build/src/github.com/opencontainers/runc
34 mkdir -p "${RUNC_DIR}" || die
35 tar -x --strip-components=1 -f "${DISTDIR}/k3s-runc-${K3S_RUNC_VERSION}.tar.gz" -C "${RUNC_DIR}" || die
36 sed -e 's|mod=vendor|mod=readonly|g' -i "${RUNC_DIR}/Makefile" || die
37 -}
38
39 -src_prepare() {
40 - local filename pattern replacement
41 - default
42 # Disable download for files fetched via SRC_URI.
43 sed -e 's:^curl:#\0:' \
44 -e 's:^git:#\0:' \