1 |
commit: 701d5a2b5d7eda200df585e0b7ab3ed8a7cc62d3 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Oct 13 03:16:12 2021 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 13 03:32:57 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=701d5a2b |
7 |
|
8 |
sys-cluster/k3s: Fix 1.20.11 bugs in "download" script |
9 |
|
10 |
Bug: https://bugs.gentoo.org/817842 |
11 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
12 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
13 |
|
14 |
sys-cluster/k3s/k3s-1.20.11.ebuild | 5 +++-- |
15 |
1 file changed, 3 insertions(+), 2 deletions(-) |
16 |
|
17 |
diff --git a/sys-cluster/k3s/k3s-1.20.11.ebuild b/sys-cluster/k3s/k3s-1.20.11.ebuild |
18 |
index a8751e31b0a..20b0aca0b3c 100644 |
19 |
--- a/sys-cluster/k3s/k3s-1.20.11.ebuild |
20 |
+++ b/sys-cluster/k3s/k3s-1.20.11.ebuild |
21 |
@@ -1594,7 +1594,8 @@ src_prepare() { |
22 |
# Disable download for files fetched via SRC_URI. |
23 |
sed -e 's:^curl:#\0:' \ |
24 |
-e 's:^git:#\0:' \ |
25 |
- -e 's:^rm -rf ${RUNC_DIR}:#\0:' \ |
26 |
+ -e 's:^rm -rf \${CHARTS_DIR}:#\0:' \ |
27 |
+ -e 's:^rm -rf \${RUNC_DIR}:#\0:' \ |
28 |
-i scripts/download || die |
29 |
sed -e '/scripts\/build-upload/d' -i scripts/package-cli || die |
30 |
pattern='git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR' |
31 |
@@ -1610,7 +1611,7 @@ src_prepare() { |
32 |
|
33 |
src_compile() { |
34 |
mkdir -p build/data || die |
35 |
- ./scripts/download || die |
36 |
+ "${BASH}" -ex ./scripts/download || die |
37 |
./scripts/build || die |
38 |
./scripts/package-cli || die |
39 |
} |