commit: 48c8ba622cfd39d65759f0b334e8ac9f67803ed9 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Wed Oct 13 02:50:05 2021 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Wed Oct 13 03:32:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48c8ba62
sys-cluster/k3s: Fix 1.21.5 bugs in "download" script Bug: https://bugs.gentoo.org/817842 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> sys-cluster/k3s/k3s-1.21.5.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys-cluster/k3s/k3s-1.21.5.ebuild b/sys-cluster/k3s/k3s-1.21.5.ebuild index c41090fdf29..0e20a482fe9 100644 --- a/sys-cluster/k3s/k3s-1.21.5.ebuild +++ b/sys-cluster/k3s/k3s-1.21.5.ebuild @@ -1674,7 +1674,9 @@ src_prepare() { # Disable download for files fetched via SRC_URI. sed -e 's:^[[:space:]]*curl:#\0:' \ -e 's:^[[:space:]]*git:#\0:' \ - -e 's:^rm -rf ${RUNC_DIR}:#\0:' \ + -e 's:^rm -rf \${CHARTS_DIR}:#\0:' \ + -e 's:^rm -rf \${RUNC_DIR}:#\0:' \ + -e 's:yq e :yq -r :' \ -e "s:^setup_tmp\$:TMP_DIR=${S}/build/static/charts:" \ -i scripts/download || die sed -e '/scripts\/build-upload/d' -i scripts/package-cli || die @@ -1691,7 +1693,7 @@ src_prepare() { src_compile() { mkdir -p build/data || die - ./scripts/download || die + "${BASH}" -ex ./scripts/download || die ./scripts/build || die ./scripts/package-cli || die }
