commit: 094efc3a21b953cc462b69afcd71a0474a7a6838 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Tue Oct 12 20:07:00 2021 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Tue Oct 12 21:02:44 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=094efc3a
sys-cluster/k3s: Fix 1.22.2 bugs in "download" script Closes: 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/Manifest | 1 + sys-cluster/k3s/k3s-1.22.2.ebuild | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sys-cluster/k3s/Manifest b/sys-cluster/k3s/Manifest index d58ae09db2a..f0e4d1761c0 100644 --- a/sys-cluster/k3s/Manifest +++ b/sys-cluster/k3s/Manifest @@ -2995,6 +2995,7 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa2 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea2915c308de08e9696a8c82b3831bf5dc01f8aefc21b13b5b9a210f24ff8782909308137c25363074753427109e009889b7860f5f SHA512 712a936d07bfe4c2e67a4f199346d7e96db35486a0f051365c4636ddbc6505cf540995bc67e6a03b1b58e1e4816ece573418f23bf9ce93fcdc141a05f922f527 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb93b06fd376d1b0932626c7dcbdaf43df8c8eb14e07529e84e028576bb67ce1961c3c86d0303d375d8d0aa372ded259c3561b9291 SHA512 52a52b3d380ae6e2cbe1b2c849d3089f74aa876fb3fadfbd02eada97446e0f2cf387f10ddb527f2dfefd57dccba8c82b0b349efbecaa0e6e3d00dc2b5d4fc21e DIST traefik-1.81.0.tgz 27292 BLAKE2B c15449a4e1485e2deafee8cf3964a05687b036ff2d50bacd2db1ad461f210f66dd411d79deaebff30bfaf1c0ea0ae6bb82d898d015490ac1cef07afcaeff1563 SHA512 df9f398744b4a3669426698ea87a0f2b553948ae1183c5c95f3b4bac1ae62847b75b2101805afc674881a02704718ed5ca362c88691cd7753bcc0b1db438310e +DIST traefik-10.3.0.tgz 24016 BLAKE2B f3da409f9b86fcc78c58e50936115a67fd595b43d71f9e4b4b15f1b482a79945ea33a4d879aab1cc902a3aac04053dd6296186e1adf9e23ca309ce2a87163156 SHA512 bbd6e290eb14b2a797f4d6abe0f9487290c7b78a9397d70dbb18f30ce84b2b2792d52b8feca4f8c38f64dd89ae49b31b7b13a603478fe02e805516ab666f71ad DIST traefik-9.18.2.tgz 17026 BLAKE2B aa356f9b0778f90d53eee29581c9ee0e70fbba30e878c848ecf4a3af5322b854a7b1159f0e3d5d2a7469f00231c111dc0e590ce8292a6e4791e804323e783fcd SHA512 c52608ae34a3cf49688e221d342558588447ff0b618c2c06dc9e8c356425cbaca82e50cc78b77452ca71cb940230da097884cefa2d99aba3b7ac8cbb303765fd DIST vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.mod 20 BLAKE2B 9817a2968dcdd45e9e5d40b93cb54e6002d0aa6613f241bd77d448b3173b639f58a88d25899734be39a822473b4aac69ad947878006d5bb266a13f24637b0082 SHA512 b052661c1a3c2599fa350578cde2899166b39b71c65a6414ca7ea33e8d5186e85895ebd948819313781041d06fac3292cb08ad12447060df3860a86402344c24 DIST vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.zip 27337 BLAKE2B a191bd4ef424697548532023bacc2f1cc67801e456d8ada577946204686c444b53c2bd3fc757f77aa07d8b79b3cd45f01e37b01521d6ebea0c621f87d246861c SHA512 77441a4a14c9b5c266eedde3c9eb6d7499a7a2ca57139071197b71fe2d3d1d1cc63c3eed95673733a2b855f329ccb30dcab568e1d743231eb1238ca0154524e6 diff --git a/sys-cluster/k3s/k3s-1.22.2.ebuild b/sys-cluster/k3s/k3s-1.22.2.ebuild index be386c48334..f100d470849 100644 --- a/sys-cluster/k3s/k3s-1.22.2.ebuild +++ b/sys-cluster/k3s/k3s-1.22.2.ebuild @@ -8,7 +8,7 @@ DESCRIPTION="Lightweight Kubernetes" HOMEPAGE="https://k3s.io"; K3S_RUNC_VERSION=v1.0.1 K3S_ROOT_VERSION=0.9.1 -K3S_TRAEFIK_VERSION=9.18.2 +K3S_TRAEFIK_VERSION=10.3.0 K3S_CNIPLUGINS_VERSION=0.9.1 CONFIG_CHECK="~BRIDGE_NETFILTER ~CFS_BANDWIDTH ~CGROUP_DEVICE ~CGROUP_PERF ~CGROUP_PIDS ~IP_VS ~MEMCG ~NETFILTER_XT_MATCH_COMMENT ~OVERLAY_FS ~VLAN_8021Q ~VXLAN" @@ -1652,7 +1652,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 @@ -1669,7 +1671,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 }
