diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2021-10-12 19:50:05 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2021-10-12 20:32:57 -0700 |
| commit | 48c8ba622cfd39d65759f0b334e8ac9f67803ed9 (patch) | |
| tree | e9f6dccf6ac832dc0c0c7190fcd4032cc73d485e /sys-cluster/k3s | |
| parent | dev-libs/crypto++: Stabilize 8.6.0 amd64, #817932 (diff) | |
| download | gentoo-48c8ba622cfd39d65759f0b334e8ac9f67803ed9.tar.gz gentoo-48c8ba622cfd39d65759f0b334e8ac9f67803ed9.tar.bz2 gentoo-48c8ba622cfd39d65759f0b334e8ac9f67803ed9.zip | |
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@gentoo.org>
Diffstat (limited to 'sys-cluster/k3s')
| -rw-r--r-- | sys-cluster/k3s/k3s-1.21.5.ebuild | 6 |
1 files 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 c41090fdf29f..0e20a482fe90 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 } |