| 1 |
commit: 48c8ba622cfd39d65759f0b334e8ac9f67803ed9 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 13 02:50:05 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=48c8ba62 |
| 7 |
|
| 8 |
sys-cluster/k3s: Fix 1.21.5 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.21.5.ebuild | 6 ++++-- |
| 15 |
1 file changed, 4 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-cluster/k3s/k3s-1.21.5.ebuild b/sys-cluster/k3s/k3s-1.21.5.ebuild |
| 18 |
index c41090fdf29..0e20a482fe9 100644 |
| 19 |
--- a/sys-cluster/k3s/k3s-1.21.5.ebuild |
| 20 |
+++ b/sys-cluster/k3s/k3s-1.21.5.ebuild |
| 21 |
@@ -1674,7 +1674,9 @@ src_prepare() { |
| 22 |
# Disable download for files fetched via SRC_URI. |
| 23 |
sed -e 's:^[[:space:]]*curl:#\0:' \ |
| 24 |
-e 's:^[[:space:]]*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 |
+ -e 's:yq e :yq -r :' \ |
| 29 |
-e "s:^setup_tmp\$:TMP_DIR=${S}/build/static/charts:" \ |
| 30 |
-i scripts/download || die |
| 31 |
sed -e '/scripts\/build-upload/d' -i scripts/package-cli || die |
| 32 |
@@ -1691,7 +1693,7 @@ src_prepare() { |
| 33 |
|
| 34 |
src_compile() { |
| 35 |
mkdir -p build/data || die |
| 36 |
- ./scripts/download || die |
| 37 |
+ "${BASH}" -ex ./scripts/download || die |
| 38 |
./scripts/build || die |
| 39 |
./scripts/package-cli || die |
| 40 |
} |
Archives