diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2021-10-12 20:25:47 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2021-10-12 20:32:57 -0700 |
| commit | 4c808ca58876e0a841628a8727cf14a3cb95683b (patch) | |
| tree | f6876d4742052f3d847df876979737e8daa0fe15 /sys-cluster/k3s | |
| parent | sys-cluster/k3s: Fix 1.20.11 bugs in "download" script (diff) | |
| download | gentoo-4c808ca58876e0a841628a8727cf14a3cb95683b.tar.gz gentoo-4c808ca58876e0a841628a8727cf14a3cb95683b.tar.bz2 gentoo-4c808ca58876e0a841628a8727cf14a3cb95683b.zip | |
sys-cluster/k3s: Fix 1.19.15 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.19.15.ebuild | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys-cluster/k3s/k3s-1.19.15.ebuild b/sys-cluster/k3s/k3s-1.19.15.ebuild index d14cbd88c11f..6e1358977ebc 100644 --- a/sys-cluster/k3s/k3s-1.19.15.ebuild +++ b/sys-cluster/k3s/k3s-1.19.15.ebuild @@ -1479,7 +1479,8 @@ src_prepare() { # Disable download for files fetched via SRC_URI. sed -e 's:^curl:#\0:' \ -e 's:^git:#\0:' \ - -e 's:^rm -rf ${RUNC_DIR}:#\0:' \ + -e 's:^rm -rf \${CHARTS_DIR}:#\0:' \ + -e 's:^rm -rf \${RUNC_DIR}:#\0:' \ -i scripts/download || die sed -e '/scripts\/build-upload/d' -i scripts/package-cli || die pattern='git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR' @@ -1495,7 +1496,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 } |