diff options
Diffstat (limited to 'sys-cluster')
22 files changed, 589 insertions, 8 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz Binary files differindex c90b71cd0d8d..badbb7a9d0ac 100644 --- a/sys-cluster/Manifest.gz +++ b/sys-cluster/Manifest.gz diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest index 2becbc29720d..447c77d4a09a 100644 --- a/sys-cluster/kube-apiserver/Manifest +++ b/sys-cluster/kube-apiserver/Manifest @@ -1,3 +1,4 @@ +AUX kube-apiserver-1.28.0-make-gomaxprocs-install-optional.patch 2835 BLAKE2B 964759a3af2afced4d5ff2ed59b1e94c2912a85ce560f3dac4e0ea59b1e308ee7b35f6d5435524e6e407d2032a1bd8783fb0b4787dbb22cfa9ace9ff723b1c40 SHA512 88b369bfda14eb03f9957f4b9105a565fa6f821e20b4743941f12f7e5b005cdef4184e0c09d54102b811e08a27f1725b0dc36e29e331f8802b7eaf52db1ce00f AUX kube-apiserver.confd 116 BLAKE2B 2cf2dff516674ba4dc0763985a070b75e23f9af51e7334eedcb2593855e7481d5969ed458d322ac29de0e9a9c7f9f041911ee7aeca750ff77ce04fd60bf3a3d3 SHA512 302b2a7ec715967c0aa7d1c177d4e55b26e37ebba8d04dd37ecf627d20042fe91cd7e6192ff9d71422129b0ea54a9eec6046f505af550548bd450998924f37ee AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c737d041a808fb5012522844614a40059524c472b9b50fd077253b75e2bcf33d69518d71428fcb7e27143fba SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e @@ -18,5 +19,5 @@ EBUILD kube-apiserver-1.26.6.ebuild 991 BLAKE2B 27a5563d75bb7c818335c8d019b63c23 EBUILD kube-apiserver-1.26.7.ebuild 991 BLAKE2B 27a5563d75bb7c818335c8d019b63c2371a7c72d679bb237d79cc699ffd7e5f4f5f11a4197cdd086c4162d2af3fcb5c252a4effcd2fdc7ddf95fc0c1c2784946 SHA512 4dcce5a68b1f97d9f13191677fb21324317f38d5b4b2f15d4514b83ea96e097d5bbe86260c1f8ad462373d234cbe361ef9e2b3b615ee4cb86d984b83b5acddd8 EBUILD kube-apiserver-1.27.3.ebuild 991 BLAKE2B a8f7a56d24d5d28dd947049982b22b2b409bd04a4257dff823833b63d48a842cdcc1a1dd48cab9aae8cc5cd91b2e760937898d75685e88c0ff3de5e87c755708 SHA512 03d62b412a1400c9a10c694a08a6e1dd8bcf431e4c1204e06bf10861d844a195a7e1dac51c61d34621129277bf898f83e5aeaced8798e06bcf3c80c339b235e5 EBUILD kube-apiserver-1.27.4.ebuild 991 BLAKE2B a8f7a56d24d5d28dd947049982b22b2b409bd04a4257dff823833b63d48a842cdcc1a1dd48cab9aae8cc5cd91b2e760937898d75685e88c0ff3de5e87c755708 SHA512 03d62b412a1400c9a10c694a08a6e1dd8bcf431e4c1204e06bf10861d844a195a7e1dac51c61d34621129277bf898f83e5aeaced8798e06bcf3c80c339b235e5 -EBUILD kube-apiserver-1.28.0.ebuild 992 BLAKE2B 2220811e7ac652e6fe35de874d2b22d2c1bbed04d79b44625f044d07f081f2c11c34d6bc213b225f1face82fe5ac30b9c5e273ff718cbfb164c88cdca8fa03d5 SHA512 9c8fce637e8dae24fc85ecf79a2d8a21196d45e5dd70cabedfd34dc49be4ab369ff59e93f0c73db13347dc5ef8b6521903cc47a8c1cca46809ea9a10b0c52f01 +EBUILD kube-apiserver-1.28.0.ebuild 1085 BLAKE2B 143ea51902685ea5f88d50d7c828ff64f9021d647e6711fd42ea8d3e266951e3753f147a9b88793084472defe0a8e8de0d9f3d0291b61b6cf4a0d5ba2a7a2cbd SHA512 b65b1197372d4e77396d94070e68d5a7ef4114277c2a9202520b087b95bba769c89b5ad7cb41d4c1e1e3d53c51a2a1ac0c95d30c811ab0dbcd4418a90e95367b MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb diff --git a/sys-cluster/kube-apiserver/files/kube-apiserver-1.28.0-make-gomaxprocs-install-optional.patch b/sys-cluster/kube-apiserver/files/kube-apiserver-1.28.0-make-gomaxprocs-install-optional.patch new file mode 100644 index 000000000000..1a8935b31c9c --- /dev/null +++ b/sys-cluster/kube-apiserver/files/kube-apiserver-1.28.0-make-gomaxprocs-install-optional.patch @@ -0,0 +1,78 @@ +From cce3f6ffa796ea416021b0d62567a3f52b979567 Mon Sep 17 00:00:00 2001 +From: Jordan Liggitt <liggitt@google.com> +Date: Wed, 16 Aug 2023 09:33:02 -0400 +Subject: [PATCH 2/2] Make gomaxprocs install optional, limit to tests + +--- + hack/lib/golang.sh | 25 +++++++++++++++---------- + hack/make-rules/test-e2e-node.sh | 1 + + hack/make-rules/test.sh | 1 + + 3 files changed, 17 insertions(+), 10 deletions(-) + +diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh +index 66772f08a81..983ff368e25 100755 +--- a/hack/lib/golang.sh ++++ b/hack/lib/golang.sh +@@ -556,20 +556,25 @@ kube::golang::setup_env() { + + # This seems to matter to some tools + export GO15VENDOREXPERIMENT=1 ++} + ++kube::golang::setup_gomaxprocs() { + # GOMAXPROCS by default does not reflect the number of cpu(s) available + # when running in a container, please see https://github.com/golang/go/issues/33803 +- if ! command -v ncpu >/dev/null 2>&1; then +- # shellcheck disable=SC2164 +- pushd "${KUBE_ROOT}/hack/tools" >/dev/null +- GO111MODULE=on go install ./ncpu +- # shellcheck disable=SC2164 +- popd >/dev/null ++ if [[ -z "${GOMAXPROCS:-}" ]]; then ++ if ! command -v ncpu >/dev/null 2>&1; then ++ # shellcheck disable=SC2164 ++ pushd "${KUBE_ROOT}/hack/tools" >/dev/null ++ GO111MODULE=on go install ./ncpu || echo "Will not automatically set GOMAXPROCS" ++ # shellcheck disable=SC2164 ++ popd >/dev/null ++ fi ++ if command -v ncpu >/dev/null 2>&1; then ++ GOMAXPROCS=$(ncpu) ++ export GOMAXPROCS ++ kube::log::status "Set GOMAXPROCS automatically to ${GOMAXPROCS}" ++ fi + fi +- +- GOMAXPROCS=${GOMAXPROCS:-$(ncpu)} +- export GOMAXPROCS +- kube::log::status "Setting GOMAXPROCS: ${GOMAXPROCS}" + } + + # This will take binaries from $GOPATH/bin and copy them to the appropriate +diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh +index 43dde0c740f..49e3e04ac71 100755 +--- a/hack/make-rules/test-e2e-node.sh ++++ b/hack/make-rules/test-e2e-node.sh +@@ -18,6 +18,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../.. + source "${KUBE_ROOT}/hack/lib/init.sh" + + kube::golang::setup_env ++kube::golang::setup_gomaxprocs + + # start the cache mutation detector by default so that cache mutators will be found + KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}" +diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh +index e9074678a8f..4aa72730d83 100755 +--- a/hack/make-rules/test.sh ++++ b/hack/make-rules/test.sh +@@ -22,6 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../.. + source "${KUBE_ROOT}/hack/lib/init.sh" + + kube::golang::setup_env ++kube::golang::setup_gomaxprocs + + # start the cache mutation detector by default so that cache mutators will be found + KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}" +-- +2.41.0 + diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.28.0.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.28.0.ebuild index 4385ac330a7d..4e599b798a47 100644 --- a/sys-cluster/kube-apiserver/kube-apiserver-1.28.0.ebuild +++ b/sys-cluster/kube-apiserver/kube-apiserver-1.28.0.ebuild @@ -23,8 +23,12 @@ BDEPEND=">=dev-lang/go-1.20" RESTRICT+=" test" S="${WORKDIR}/kubernetes-${PV}" +PATCHES=( + "${FILESDIR}"/${P}-make-gomaxprocs-install-optional.patch + ) + src_compile() { - CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \ + CGO_LDFLAGS="$(usex hardened '-fNO-PIC ' '')" FORCE_HOST_GO="yes" \ emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN} } diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest index ec9a52773280..6eb4886d747f 100644 --- a/sys-cluster/kube-controller-manager/Manifest +++ b/sys-cluster/kube-controller-manager/Manifest @@ -1,3 +1,4 @@ +AUX kube-controller-manager-1.28.0-make-gomaxprocs-install-optional.patch 2835 BLAKE2B 964759a3af2afced4d5ff2ed59b1e94c2912a85ce560f3dac4e0ea59b1e308ee7b35f6d5435524e6e407d2032a1bd8783fb0b4787dbb22cfa9ace9ff723b1c40 SHA512 88b369bfda14eb03f9957f4b9105a565fa6f821e20b4743941f12f7e5b005cdef4184e0c09d54102b811e08a27f1725b0dc36e29e331f8802b7eaf52db1ce00f AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2cf815b25ac4e91354e3fce756a1955e71ec762fab1091074ef4233fff22667aba50417c0d6a896055f8f52b6630bb4e SHA512 b0227a7431018a6742b3931fda0f14b4a040107ecd6821c84593180919ba8a5af9b99b7a507645a5488792f14accd686acc4cc6f70a5084bbdfcdd494021aafc AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c @@ -18,5 +19,5 @@ EBUILD kube-controller-manager-1.26.6.ebuild 988 BLAKE2B c0ef8c338ce9b85ea7f8751 EBUILD kube-controller-manager-1.26.7.ebuild 988 BLAKE2B c0ef8c338ce9b85ea7f875158058fb09f6946862f32983f478638842b4b30e5eb43c5f82f0799f3f47491f19fba4475e9ca29b5630ef5e0b91bc4da472951c5a SHA512 02b9a4c1b5d8d0c4eb4ce3de6a2fcf99ca6d08c3b6bd51574f717a123ffd2499d77905af5a501f32df9b06ebf12e9757d87a61942fd9bb1b8210083321311b97 EBUILD kube-controller-manager-1.27.3.ebuild 988 BLAKE2B cb730bcc2d0badbe5bbec3a13ac97a7059296d2f5f90fa6ddf4526a5f66b8f9ee45f9ee3035dbfcd1ca082a95b7e6875d7084dd983729c9fe4bb798f5200e57e SHA512 b589f8d4f13f14608227ff5ce34a2bd509b84188863a733bdd0ab8f8dae1b39046d2eef1e217cf7a6c014dcf37511024fe775fb72ec0ee6a7a72535611b7b814 EBUILD kube-controller-manager-1.27.4.ebuild 988 BLAKE2B cb730bcc2d0badbe5bbec3a13ac97a7059296d2f5f90fa6ddf4526a5f66b8f9ee45f9ee3035dbfcd1ca082a95b7e6875d7084dd983729c9fe4bb798f5200e57e SHA512 b589f8d4f13f14608227ff5ce34a2bd509b84188863a733bdd0ab8f8dae1b39046d2eef1e217cf7a6c014dcf37511024fe775fb72ec0ee6a7a72535611b7b814 -EBUILD kube-controller-manager-1.28.0.ebuild 989 BLAKE2B fb2b9997a42d14c19b8a5a7e4c2c174b113e24f2e2f124bc2a7e65c77f41d0134e458c08b3dc333c7bb775f1e2a6142202ff54d997a74e7cfdf9c129ddef45cb SHA512 2d9dd0addd090f60b695056f82649573e1c86b97f65bd1ae85cf90265124e96ae2334fd1a01056eb7f60655baf1ab18f145c7f4257b41f3a5b3df275751db3f9 +EBUILD kube-controller-manager-1.28.0.ebuild 1062 BLAKE2B b2ad8e8f73a2c65b8d6c1b7052fef66e7a8c9c573d5300cb5e732e951c744be9d09f77d2317c148ac39ff48347e457a239f3401b2af195ed2a17b5d967a9ba56 SHA512 f37a0fe92c9e6ae2505a2c36981b8f70702b159f551b47900e7110a4d7d4d09f2b6dbfd04ade7b852006abfaeb49cfa1d12adfb80e8236708e6777b08ea25222 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb diff --git a/sys-cluster/kube-controller-manager/files/kube-controller-manager-1.28.0-make-gomaxprocs-install-optional.patch b/sys-cluster/kube-controller-manager/files/kube-controller-manager-1.28.0-make-gomaxprocs-install-optional.patch new file mode 100644 index 000000000000..1a8935b31c9c --- /dev/null +++ b/sys-cluster/kube-controller-manager/files/kube-controller-manager-1.28.0-make-gomaxprocs-install-optional.patch @@ -0,0 +1,78 @@ +From cce3f6ffa796ea416021b0d62567a3f52b979567 Mon Sep 17 00:00:00 2001 +From: Jordan Liggitt <liggitt@google.com> +Date: Wed, 16 Aug 2023 09:33:02 -0400 +Subject: [PATCH 2/2] Make gomaxprocs install optional, limit to tests + +--- + hack/lib/golang.sh | 25 +++++++++++++++---------- + hack/make-rules/test-e2e-node.sh | 1 + + hack/make-rules/test.sh | 1 + + 3 files changed, 17 insertions(+), 10 deletions(-) + +diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh +index 66772f08a81..983ff368e25 100755 +--- a/hack/lib/golang.sh ++++ b/hack/lib/golang.sh +@@ -556,20 +556,25 @@ kube::golang::setup_env() { + + # This seems to matter to some tools + export GO15VENDOREXPERIMENT=1 ++} + ++kube::golang::setup_gomaxprocs() { + # GOMAXPROCS by default does not reflect the number of cpu(s) available + # when running in a container, please see https://github.com/golang/go/issues/33803 +- if ! command -v ncpu >/dev/null 2>&1; then +- # shellcheck disable=SC2164 +- pushd "${KUBE_ROOT}/hack/tools" >/dev/null +- GO111MODULE=on go install ./ncpu +- # shellcheck disable=SC2164 +- popd >/dev/null ++ if [[ -z "${GOMAXPROCS:-}" ]]; then ++ if ! command -v ncpu >/dev/null 2>&1; then ++ # shellcheck disable=SC2164 ++ pushd "${KUBE_ROOT}/hack/tools" >/dev/null ++ GO111MODULE=on go install ./ncpu || echo "Will not automatically set GOMAXPROCS" ++ # shellcheck disable=SC2164 ++ popd >/dev/null ++ fi ++ if command -v ncpu >/dev/null 2>&1; then ++ GOMAXPROCS=$(ncpu) ++ export GOMAXPROCS ++ kube::log::status "Set GOMAXPROCS automatically to ${GOMAXPROCS}" ++ fi + fi +- +- GOMAXPROCS=${GOMAXPROCS:-$(ncpu)} +- export GOMAXPROCS +- kube::log::status "Setting GOMAXPROCS: ${GOMAXPROCS}" + } + + # This will take binaries from $GOPATH/bin and copy them to the appropriate +diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh +index 43dde0c740f..49e3e04ac71 100755 +--- a/hack/make-rules/test-e2e-node.sh ++++ b/hack/make-rules/test-e2e-node.sh +@@ -18,6 +18,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../.. + source "${KUBE_ROOT}/hack/lib/init.sh" + + kube::golang::setup_env ++kube::golang::setup_gomaxprocs + + # start the cache mutation detector by default so that cache mutators will be found + KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}" +diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh +index e9074678a8f..4aa72730d83 100755 +--- a/hack/make-rules/test.sh ++++ b/hack/make-rules/test.sh +@@ -22,6 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../.. + source "${KUBE_ROOT}/hack/lib/init.sh" + + kube::golang::setup_env ++kube::golang::setup_gomaxprocs + + # start the cache mutation detector by default so that cache mutators will be found + KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}" +-- +2.41.0 + diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.28.0.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.28.0.ebuild index dc4ca2df138b..683ee2008eeb 100644 --- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.28.0.ebuild +++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.28.0.ebuild @@ -22,6 +22,10 @@ BDEPEND=">=dev-lang/go-1.20" RESTRICT+=" test" S="${WORKDIR}/kubernetes-${PV}" +PATCHES=( + "${FILESDIR}"/${P}-make-gomaxprocs-install-optional.patch + ) + src_compile() { CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \ emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN} diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest index 70613a578fcf..5704968637bf 100644 --- a/sys-cluster/kube-proxy/Manifest +++ b/sys-cluster/kube-proxy/Manifest @@ -1,3 +1,4 @@ +AUX kube-proxy-1.28.0-make-gomaxprocs-install-optional.patch 2835 BLAKE2B 964759a3af2afced4d5ff2ed59b1e94c2912a85ce560f3dac4e0ea59b1e308ee7b35f6d5435524e6e407d2032a1bd8783fb0b4787dbb22cfa9ace9ff723b1c40 SHA512 88b369bfda14eb03f9957f4b9105a565fa6f821e20b4743941f12f7e5b005cdef4184e0c09d54102b811e08a27f1725b0dc36e29e331f8802b7eaf52db1ce00f AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8810268f894e3466cea4d82c7882e56d6a0bf425311adbf6a55e3e3fe351b9a1a7ce1d9e1e087018b SHA512 4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d @@ -18,5 +19,5 @@ EBUILD kube-proxy-1.26.6.ebuild 903 BLAKE2B 1aa153095ce5f8bb28c12717c62936aac24b EBUILD kube-proxy-1.26.7.ebuild 903 BLAKE2B 1aa153095ce5f8bb28c12717c62936aac24b73b7e0780a4736c59a9c7c7a492c1c3bfc15343575bd4243c02a44ba2c73ec78fa064feed192c2410df575bae4af SHA512 cb2e2a9c28cce3b178ff30e08da842a75e8dee62c72d1243c503824ed180a31f5e27c76c885c248f2760e5ba1a7a009bf30d8706bbdbd07a609914a5b924f07d EBUILD kube-proxy-1.27.3.ebuild 903 BLAKE2B 1c939447d9c99d5723a207c0310c4a14cc45b39678af42304de57e93f127d398ca9e24369369c3db5848ee23e64ac77b900ddf61368bc821a571f143aa6663d2 SHA512 d59a856c6a5b9133188f7ad48ac975f4cb88eb4b95a78a6f4c30deb79a2a83e09ce4c9abb85fbb0111f121fc869b9e118f5a90c4f6e3113a0e2a88a15c29ae9f EBUILD kube-proxy-1.27.4.ebuild 903 BLAKE2B 1c939447d9c99d5723a207c0310c4a14cc45b39678af42304de57e93f127d398ca9e24369369c3db5848ee23e64ac77b900ddf61368bc821a571f143aa6663d2 SHA512 d59a856c6a5b9133188f7ad48ac975f4cb88eb4b95a78a6f4c30deb79a2a83e09ce4c9abb85fbb0111f121fc869b9e118f5a90c4f6e3113a0e2a88a15c29ae9f -EBUILD kube-proxy-1.28.0.ebuild 904 BLAKE2B dd6a4ee3a1feff0f1250a81af3ed98a930e3814fc6ed496c3ebb5fb6f166e7649c6934e19f96a78a9f10c8bedff2dbfe6d8bf4d4b5406372f14e417f7aaf2112 SHA512 42fa664d157356844ade5f3ef4e477abc550cc9913d647643ce59618d5a2e4d4a3a0e3cd7b57cf6d0619aa7fef26e8c83963c02a8fe8106f0ee46cc06276375e +EBUILD kube-proxy-1.28.0.ebuild 976 BLAKE2B df7e2d1ccb29e7aa44e4218ba6baf8f3120ac995f12fbdec1035451630809819f4df6a71c15b236731513d096e1d5c35d51b0200a25ba05b730c6d755cfba2c9 SHA512 1de585d08e31f43d13465e8307cac9a8609065c400934cd14bbdf99ee5e68a0b68e6e90603fcda17eb6342b3435e92afb4b90b5f896f2835fab71ccb5d76e685 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb diff --git a/sys-cluster/kube-proxy/files/kube-proxy-1.28.0-make-gomaxprocs-install-optional.patch b/sys-cluster/kube-proxy/files/kube-proxy-1.28.0-make-gomaxprocs-install-optional.patch new file mode 100644 index 000000000000..1a8935b31c9c --- /dev/null +++ b/sys-cluster/kube-proxy/files/kube-proxy-1.28.0-make-gomaxprocs-install-optional.patch @@ -0,0 +1,78 @@ +From cce3f6ffa796ea416021b0d62567a3f52b979567 Mon Sep 17 00:00:00 2001 +From: Jordan Liggitt <liggitt@google.com> +Date: Wed, 16 Aug 2023 09:33:02 -0400 +Subject: [PATCH 2/2] Make gomaxprocs install optional, limit to tests + +--- + hack/lib/golang.sh | 25 +++++++++++++++---------- + hack/make-rules/test-e2e-node.sh | 1 + + hack/make-rules/test.sh | 1 + + 3 files changed, 17 insertions(+), 10 deletions(-) + +diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh +index 66772f08a81..983ff368e25 100755 +--- a/hack/lib/golang.sh ++++ b/hack/lib/golang.sh +@@ -556,20 +556,25 @@ kube::golang::setup_env() { + + # This seems to matter to some tools + export GO15VENDOREXPERIMENT=1 ++} + ++kube::golang::setup_gomaxprocs() { + # GOMAXPROCS by default does not reflect the number of cpu(s) available + # when running in a container, please see https://github.com/golang/go/issues/33803 +- if ! command -v ncpu >/dev/null 2>&1; then +- # shellcheck disable=SC2164 +- pushd "${KUBE_ROOT}/hack/tools" >/dev/null +- GO111MODULE=on go install ./ncpu +- # shellcheck disable=SC2164 +- popd >/dev/null ++ if [[ -z "${GOMAXPROCS:-}" ]]; then ++ if ! command -v ncpu >/dev/null 2>&1; then ++ # shellcheck disable=SC2164 ++ pushd "${KUBE_ROOT}/hack/tools" >/dev/null ++ GO111MODULE=on go install ./ncpu || echo "Will not automatically set GOMAXPROCS" ++ # shellcheck disable=SC2164 ++ popd >/dev/null ++ fi ++ if command -v ncpu >/dev/null 2>&1; then ++ GOMAXPROCS=$(ncpu) ++ export GOMAXPROCS ++ kube::log::status "Set GOMAXPROCS automatically to ${GOMAXPROCS}" ++ fi + fi +- +- GOMAXPROCS=${GOMAXPROCS:-$(ncpu)} +- export GOMAXPROCS +- kube::log::status "Setting GOMAXPROCS: ${GOMAXPROCS}" + } + + # This will take binaries from $GOPATH/bin and copy them to the appropriate +diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh +index 43dde0c740f..49e3e04ac71 100755 +--- a/hack/make-rules/test-e2e-node.sh ++++ b/hack/make-rules/test-e2e-node.sh +@@ -18,6 +18,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../.. + source "${KUBE_ROOT}/hack/lib/init.sh" + + kube::golang::setup_env ++kube::golang::setup_gomaxprocs + + # start the cache mutation detector by default so that cache mutators will be found + KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}" +diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh +index e9074678a8f..4aa72730d83 100755 +--- a/hack/make-rules/test.sh ++++ b/hack/make-rules/test.sh +@@ -22,6 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../.. + source "${KUBE_ROOT}/hack/lib/init.sh" + + kube::golang::setup_env ++kube::golang::setup_gomaxprocs + + # start the cache mutation detector by default so that cache mutators will be found + KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}" +-- +2.41.0 + diff --git a/sys-cluster/kube-proxy/kube-proxy-1.28.0.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.28.0.ebuild index ea991ff91e56..eb1ed50b5db5 100644 --- a/sys-cluster/kube-proxy/kube-proxy-1.28.0.ebuild +++ b/sys-cluster/kube-proxy/kube-proxy-1.28.0.ebuild @@ -19,6 +19,10 @@ BDEPEND=">=dev-lang/go-1.20" RESTRICT+=" test" S="${WORKDIR}/kubernetes-${PV}" +PATCHES=( + "${FILESDIR}"/${P}-make-gomaxprocs-install-optional.patch +) + src_compile() { CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \ emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN} diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest index 25057732eabd..064bf441a35a 100644 --- a/sys-cluster/kube-scheduler/Manifest +++ b/sys-cluster/kube-scheduler/Manifest @@ -1,3 +1,4 @@ +AUX kube-scheduler-1.28.0-make-gomaxprocs-install-optional.patch 2835 BLAKE2B 964759a3af2afced4d5ff2ed59b1e94c2912a85ce560f3dac4e0ea59b1e308ee7b35f6d5435524e6e407d2032a1bd8783fb0b4787dbb22cfa9ace9ff723b1c40 SHA512 88b369bfda14eb03f9957f4b9105a565fa6f821e20b4743941f12f7e5b005cdef4184e0c09d54102b811e08a27f1725b0dc36e29e331f8802b7eaf52db1ce00f AUX kube-scheduler.confd 133 BLAKE2B 6b88dfc011173f183a88a16d078cbb5d96d46c269129b483d650fd7dd63376e366825f483178c26e931db226478ce9d0b85412fc264d4d600a8232d0bac149e7 SHA512 d7326f34b26aaebf4b5c25a03abcff3bc3d397382ad4fed0f4718ee425e71399febf6fec6dc817813490671692d3f1b454fd5d14d9c47c3d41b0d3405a01a6c2 AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559fd9fb9efcd0db8b3c155fdba2ce8a59461cd15ed3b4294cc5b335093e12d2b8411e400927e1307b37bc6d8 SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6 @@ -18,5 +19,5 @@ EBUILD kube-scheduler-1.26.6.ebuild 961 BLAKE2B 1bf7855312c5044b5ea261baf2f35689 EBUILD kube-scheduler-1.26.7.ebuild 961 BLAKE2B 1bf7855312c5044b5ea261baf2f35689b20e5009609e9a57b85aeaab0704502c152652128206c1e938f32f6b8171d1f639eb5e84956949142954963182540d97 SHA512 deab86ef065c7c468bacac9587f44fdefca43a44d7a5badea823d512ad74e90b960d607ea2deb943cf7335479b46ffe1ab5b3262b8f97f52935dcab6060d5976 EBUILD kube-scheduler-1.27.3.ebuild 961 BLAKE2B 546de2cf745d915d594a6519ad3f561bd625995284f06358228dfffb767b6e41e3dc58476443e5ae5f99cfdcbf2e320df4eb230f0f4823bad60f962d91548e85 SHA512 89b5945c962e381251538fd96e3400d709c22e4c61b3acaac22892dd6054af3fe4b6a49af832fb1a7555ef3c2d98c3b44ce980ac95659965a561695465360d3c EBUILD kube-scheduler-1.27.4.ebuild 961 BLAKE2B 546de2cf745d915d594a6519ad3f561bd625995284f06358228dfffb767b6e41e3dc58476443e5ae5f99cfdcbf2e320df4eb230f0f4823bad60f962d91548e85 SHA512 89b5945c962e381251538fd96e3400d709c22e4c61b3acaac22892dd6054af3fe4b6a49af832fb1a7555ef3c2d98c3b44ce980ac95659965a561695465360d3c -EBUILD kube-scheduler-1.28.0.ebuild 962 BLAKE2B 40d3f7dff63e91693048e534600ce3147608761d50e50a31c37929b2977fc5f8bef3b2e3561315c821ea51f3366bd4ffc2f16fe5f1bbf9e10892b2d9c4b9ca1c SHA512 85680650665c5ef1ac0092e6ec0071513d9017779ab7275d1b80d2aa78c6d905ad928f26d7f36b2ed4524f84b47ce68fcbe79a53096ff3159cb2304fdd266b5e +EBUILD kube-scheduler-1.28.0.ebuild 1034 BLAKE2B 6cab8e572ead6b3e7403797ea59212a508cd3720844703fec92f37aabc668fc1cf0f1ce46f088aaa049934e53acc5c8e5ee2b060109c034a9ed081ecb1a57bc2 SHA512 42899061d37289a29dafe931fdb8020b50d700b8ce8b304aec829f5825286e0c76dcfb061e22e11c86434e6f861c3c49f11a6010ff395bcf6ccf3764b5ce14a9 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb diff --git a/sys-cluster/kube-scheduler/files/kube-scheduler-1.28.0-make-gomaxprocs-install-optional.patch b/sys-cluster/kube-scheduler/files/kube-scheduler-1.28.0-make-gomaxprocs-install-optional.patch new file mode 100644 index 000000000000..1a8935b31c9c --- /dev/null +++ b/sys-cluster/kube-scheduler/files/kube-scheduler-1.28.0-make-gomaxprocs-install-optional.patch @@ -0,0 +1,78 @@ +From cce3f6ffa796ea416021b0d62567a3f52b979567 Mon Sep 17 00:00:00 2001 +From: Jordan Liggitt <liggitt@google.com> +Date: Wed, 16 Aug 2023 09:33:02 -0400 +Subject: [PATCH 2/2] Make gomaxprocs install optional, limit to tests + +--- + hack/lib/golang.sh | 25 +++++++++++++++---------- + hack/make-rules/test-e2e-node.sh | 1 + + hack/make-rules/test.sh | 1 + + 3 files changed, 17 insertions(+), 10 deletions(-) + +diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh +index 66772f08a81..983ff368e25 100755 +--- a/hack/lib/golang.sh ++++ b/hack/lib/golang.sh +@@ -556,20 +556,25 @@ kube::golang::setup_env() { + + # This seems to matter to some tools + export GO15VENDOREXPERIMENT=1 ++} + ++kube::golang::setup_gomaxprocs() { + # GOMAXPROCS by default does not reflect the number of cpu(s) available + # when running in a container, please see https://github.com/golang/go/issues/33803 +- if ! command -v ncpu >/dev/null 2>&1; then +- # shellcheck disable=SC2164 +- pushd "${KUBE_ROOT}/hack/tools" >/dev/null +- GO111MODULE=on go install ./ncpu +- # shellcheck disable=SC2164 +- popd >/dev/null ++ if [[ -z "${GOMAXPROCS:-}" ]]; then ++ if ! command -v ncpu >/dev/null 2>&1; then ++ # shellcheck disable=SC2164 ++ pushd "${KUBE_ROOT}/hack/tools" >/dev/null ++ GO111MODULE=on go install ./ncpu || echo "Will not automatically set GOMAXPROCS" ++ # shellcheck disable=SC2164 ++ popd >/dev/null ++ fi ++ if command -v ncpu >/dev/null 2>&1; then ++ GOMAXPROCS=$(ncpu) ++ export GOMAXPROCS ++ kube::log::status "Set GOMAXPROCS automatically to ${GOMAXPROCS}" ++ fi + fi +- +- GOMAXPROCS=${GOMAXPROCS:-$(ncpu)} +- export GOMAXPROCS +- kube::log::status "Setting GOMAXPROCS: ${GOMAXPROCS}" + } + + # This will take binaries from $GOPATH/bin and copy them to the appropriate +diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh +index 43dde0c740f..49e3e04ac71 100755 +--- a/hack/make-rules/test-e2e-node.sh ++++ b/hack/make-rules/test-e2e-node.sh +@@ -18,6 +18,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../.. + source "${KUBE_ROOT}/hack/lib/init.sh" + + kube::golang::setup_env ++kube::golang::setup_gomaxprocs + + # start the cache mutation detector by default so that cache mutators will be found + KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}" +diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh +index e9074678a8f..4aa72730d83 100755 +--- a/hack/make-rules/test.sh ++++ b/hack/make-rules/test.sh +@@ -22,6 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../.. + source "${KUBE_ROOT}/hack/lib/init.sh" + + kube::golang::setup_env ++kube::golang::setup_gomaxprocs + + # start the cache mutation detector by default so that cache mutators will be found + KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}" +-- +2.41.0 + diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.28.0.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.28.0.ebuild index 038445235f63..d2d2dc5e3ba5 100644 --- a/sys-cluster/kube-scheduler/kube-scheduler-1.28.0.ebuild +++ b/sys-cluster/kube-scheduler/kube-scheduler-1.28.0.ebuild @@ -22,6 +22,10 @@ BDEPEND=">=dev-lang/go-1.20" RESTRICT+=" test" S="${WORKDIR}/kubernetes-${PV}" +PATCHES=( + "${FILESDIR}"/${P}-make-gomaxprocs-install-optional.patch +) + src_compile() { CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \ emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN} diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest index 81234c64f616..b3186b58d136 100644 --- a/sys-cluster/kubeadm/Manifest +++ b/sys-cluster/kubeadm/Manifest @@ -1,3 +1,4 @@ +AUX kubeadm-1.28.0-make-gomaxprocs-install-optional.patch 2835 BLAKE2B 964759a3af2afced4d5ff2ed59b1e94c2912a85ce560f3dac4e0ea59b1e308ee7b35f6d5435524e6e407d2032a1bd8783fb0b4787dbb22cfa9ace9ff723b1c40 SHA512 88b369bfda14eb03f9957f4b9105a565fa6f821e20b4743941f12f7e5b005cdef4184e0c09d54102b811e08a27f1725b0dc36e29e331f8802b7eaf52db1ce00f DIST kubernetes-1.24.14.tar.gz 37908337 BLAKE2B 08f52b611bea49f1c204a4fb956d87be6f571ef122b4cc10101862c61d11751d944d9140c4355be95759f83240cb8a3d4879c72e077bdc10f235d03b1a0f99f7 SHA512 74cee62fdc7e0dca1430688e832d3b308b6604dee6ca88d5f19fd6b6a9c83833d003ae87d8a09866e2e8fd01cbde0a6ae4bd126f9845f770c76942f1772f04bb DIST kubernetes-1.24.15.tar.gz 38151496 BLAKE2B 47064fefb135031ed220341d34519b4ee2e6fb5996e4bacdfd94e5dd01c1e70b0ca56c0eda45208039004ab9f0f2c3d1de3d77f450d7a59ab5ccd1c6e4dc8b0e SHA512 48e450c76fe3c9bd8460a18bbff204ba7b548c807f984ba86ff388206bfc8a178d96718df377a354c88a99c66b54013ee85ba18b7778bd68cee610955abf2498 DIST kubernetes-1.25.11.tar.gz 38468419 BLAKE2B fa90ffc6fdcba31f4fb70f7ea9cecae5d8e42efb0596abb2aa638e9d235f770cf4772cfa926b3e1a59fa37ae84bc1524d803215d4eccc04cc1d38ec4b884a9fa SHA512 e3805cf6ad4e5b4ce5fb53a73873a3e447cc62b26f106afa1eec21071a7912cfd2e972f27f40c183af3e67a8ac107adc97d63a303b844dcae62e5efa0e1879a5 @@ -15,5 +16,5 @@ EBUILD kubeadm-1.26.6.ebuild 964 BLAKE2B 98417244686292bceab7268358757606d233d5b EBUILD kubeadm-1.26.7.ebuild 964 BLAKE2B 98417244686292bceab7268358757606d233d5b17f1cff311969993ee9f7a78c80449dd0bc3a22e08eabba9fa1a9e9865edfaaa158103dc7df9211a60a3b8ee3 SHA512 9f7348c3c1a7a1f16a523af7243b08570102e953c692aed930ecbfd2307577eb2f0cb61f3df6dfb5ab79fd162bad6c1f2b430ac6d1ba013d2b1f05c5c6e31e79 EBUILD kubeadm-1.27.3.ebuild 964 BLAKE2B 2de314b49858492b10da2d4de81f4fb185ed98a7854d2cd905c616e77fa19a42358d8d6b8199b3a641ff39b03426b9e8e67d6057cdb479d29a72af31679267b2 SHA512 0a5fbd3122ad732b7d84598f1f4fe2fde522462007a06b7dfbdcf939b64b3eeb1c2e2a6f1ec00d37278790701f27e6ae7e5509e8683c972db7973ed53e241a1b EBUILD kubeadm-1.27.4.ebuild 964 BLAKE2B 2de314b49858492b10da2d4de81f4fb185ed98a7854d2cd905c616e77fa19a42358d8d6b8199b3a641ff39b03426b9e8e67d6057cdb479d29a72af31679267b2 SHA512 0a5fbd3122ad732b7d84598f1f4fe2fde522462007a06b7dfbdcf939b64b3eeb1c2e2a6f1ec00d37278790701f27e6ae7e5509e8683c972db7973ed53e241a1b -EBUILD kubeadm-1.28.0.ebuild 983 BLAKE2B ee641f0271ce5abd3e90dcdf3888955725a573f89c42dd903d38d85c7b8d36e4384301678d3072b19bd477b0db3f960ab5b0d961673b13bfc6e63924bdd00076 SHA512 1f4f290a65db5bba37df7f3dc838e2bcdab84d23b3d84e8f1f3b312c70ab5cc3dfcd37be61ee0530de0656b1a6b282814276562f478887907c77b7eaef3fcbf1 +EBUILD kubeadm-1.28.0.ebuild 1056 BLAKE2B 235f9dcd4e3f751426ecb28f5f5ffe9effa9ddfd69cf3cb52f3555343a3e7b35578126b1fd1a27e6f724db77ffc4385e70689d52bd1b77ee2f87466a8e5351de SHA512 e3f7f455c0fa19eed967386c3bedbe2cab72e678c133db684b0debd78639694d2f38c732b483ccdaf9674ef3bf6ca78db7d85ce0e04e49e5308ebbebd60cb14b MISC metadata.xml 918 BLAKE2B 487a711e9aebe9d4d8f2c3a03664990aa544a4c0b969dbb60d10ebf42ca64cb9b21f822f92e774f3a813b409d5df905c8ecf02f186218f925a69f70b2960d53c SHA512 392d1cdf4179bc2aa14598e41e38e364518f0c71c34d61280729ae2cdab37c247112b48fcea58c792f6f7148e3979dfbff174bac3a3a00b7084168332112f5d3 diff --git a/sys-cluster/kubeadm/files/kubeadm-1.28.0-make-gomaxprocs-install-optional.patch b/sys-cluster/kubeadm/files/kubeadm-1.28.0-make-gomaxprocs-install-optional.patch new file mode 100644 index 000000000000..1a8935b31c9c --- /dev/null +++ b/sys-cluster/kubeadm/files/kubeadm-1.28.0-make-gomaxprocs-install-optional.patch @@ -0,0 +1,78 @@ +From cce3f6ffa796ea416021b0d62567a3f52b979567 Mon Sep 17 00:00:00 2001 +From: Jordan Liggitt <liggitt@google.com> +Date: Wed, 16 Aug 2023 09:33:02 -0400 +Subject: [PATCH 2/2] Make gomaxprocs install optional, limit to tests + +--- + hack/lib/golang.sh | 25 +++++++++++++++---------- + hack/make-rules/test-e2e-node.sh | 1 + + hack/make-rules/test.sh | 1 + + 3 files changed, 17 insertions(+), 10 deletions(-) + +diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh +index 66772f08a81..983ff368e25 100755 +--- a/hack/lib/golang.sh ++++ b/hack/lib/golang.sh +@@ -556,20 +556,25 @@ kube::golang::setup_env() { + + # This seems to matter to some tools + export GO15VENDOREXPERIMENT=1 ++} + ++kube::golang::setup_gomaxprocs() { + # GOMAXPROCS by default does not reflect the number of cpu(s) available + # when running in a container, please see https://github.com/golang/go/issues/33803 +- if ! command -v ncpu >/dev/null 2>&1; then +- # shellcheck disable=SC2164 +- pushd "${KUBE_ROOT}/hack/tools" >/dev/null +- GO111MODULE=on go install ./ncpu +- # shellcheck disable=SC2164 +- popd >/dev/null ++ if [[ -z "${GOMAXPROCS:-}" ]]; then ++ if ! command -v ncpu >/dev/null 2>&1; then ++ # shellcheck disable=SC2164 ++ pushd "${KUBE_ROOT}/hack/tools" >/dev/null ++ GO111MODULE=on go install ./ncpu || echo "Will not automatically set GOMAXPROCS" ++ # shellcheck disable=SC2164 ++ popd >/dev/null ++ fi ++ if command -v ncpu >/dev/null 2>&1; then ++ GOMAXPROCS=$(ncpu) ++ export GOMAXPROCS ++ kube::log::status "Set GOMAXPROCS automatically to ${GOMAXPROCS}" ++ fi + fi +- +- GOMAXPROCS=${GOMAXPROCS:-$(ncpu)} +- export GOMAXPROCS +- kube::log::status "Setting GOMAXPROCS: ${GOMAXPROCS}" + } + + # This will take binaries from $GOPATH/bin and copy them to the appropriate +diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh +index 43dde0c740f..49e3e04ac71 100755 +--- a/hack/make-rules/test-e2e-node.sh ++++ b/hack/make-rules/test-e2e-node.sh +@@ -18,6 +18,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../.. + source "${KUBE_ROOT}/hack/lib/init.sh" + + kube::golang::setup_env ++kube::golang::setup_gomaxprocs + + # start the cache mutation detector by default so that cache mutators will be found + KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}" +diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh +index e9074678a8f..4aa72730d83 100755 +--- a/hack/make-rules/test.sh ++++ b/hack/make-rules/test.sh +@@ -22,6 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../.. + source "${KUBE_ROOT}/hack/lib/init.sh" + + kube::golang::setup_env ++kube::golang::setup_gomaxprocs + + # start the cache mutation detector by default so that cache mutators will be found + KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}" +-- +2.41.0 + diff --git a/sys-cluster/kubeadm/kubeadm-1.28.0.ebuild b/sys-cluster/kubeadm/kubeadm-1.28.0.ebuild index a7a02677a302..a1c9807b07ae 100644 --- a/sys-cluster/kubeadm/kubeadm-1.28.0.ebuild +++ b/sys-cluster/kubeadm/kubeadm-1.28.0.ebuild @@ -20,6 +20,10 @@ RDEPEND="app-containers/cri-tools RESTRICT+=" test" S="${WORKDIR}/kubernetes-${PV}" +PATCHES=( + "${FILESDIR}"/${P}-make-gomaxprocs-install-optional.patch + ) + src_compile() { CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" FORCE_HOST_GO=yes \ emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN} diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest index 085c91bbea95..6495f49fddee 100644 --- a/sys-cluster/kubectl/Manifest +++ b/sys-cluster/kubectl/Manifest @@ -1,3 +1,4 @@ +AUX kubectl-1.28.0-make-gomaxprocs-install-optional.patch 2835 BLAKE2B 964759a3af2afced4d5ff2ed59b1e94c2912a85ce560f3dac4e0ea59b1e308ee7b35f6d5435524e6e407d2032a1bd8783fb0b4787dbb22cfa9ace9ff723b1c40 SHA512 88b369bfda14eb03f9957f4b9105a565fa6f821e20b4743941f12f7e5b005cdef4184e0c09d54102b811e08a27f1725b0dc36e29e331f8802b7eaf52db1ce00f DIST kubernetes-1.24.14.tar.gz 37908337 BLAKE2B 08f52b611bea49f1c204a4fb956d87be6f571ef122b4cc10101862c61d11751d944d9140c4355be95759f83240cb8a3d4879c72e077bdc10f235d03b1a0f99f7 SHA512 74cee62fdc7e0dca1430688e832d3b308b6604dee6ca88d5f19fd6b6a9c83833d003ae87d8a09866e2e8fd01cbde0a6ae4bd126f9845f770c76942f1772f04bb DIST kubernetes-1.24.15.tar.gz 38151496 BLAKE2B 47064fefb135031ed220341d34519b4ee2e6fb5996e4bacdfd94e5dd01c1e70b0ca56c0eda45208039004ab9f0f2c3d1de3d77f450d7a59ab5ccd1c6e4dc8b0e SHA512 48e450c76fe3c9bd8460a18bbff204ba7b548c807f984ba86ff388206bfc8a178d96718df377a354c88a99c66b54013ee85ba18b7778bd68cee610955abf2498 DIST kubernetes-1.25.11.tar.gz 38468419 BLAKE2B fa90ffc6fdcba31f4fb70f7ea9cecae5d8e42efb0596abb2aa638e9d235f770cf4772cfa926b3e1a59fa37ae84bc1524d803215d4eccc04cc1d38ec4b884a9fa SHA512 e3805cf6ad4e5b4ce5fb53a73873a3e447cc62b26f106afa1eec21071a7912cfd2e972f27f40c183af3e67a8ac107adc97d63a303b844dcae62e5efa0e1879a5 @@ -15,5 +16,5 @@ EBUILD kubectl-1.26.6.ebuild 873 BLAKE2B b4e63afdf9235f8890d11764f0779540685f007 EBUILD kubectl-1.26.7.ebuild 873 BLAKE2B b4e63afdf9235f8890d11764f0779540685f007f4a5a1db4c319a8a66d6308549fa764624d99170088c7f82fab9e82173f04f18303b33272bbbc08764be86738 SHA512 9931017dc27ff974a94bff3ee60b3741e24bac819a38ead32d68d96ff08a04a113b22752f9f4076f7b850f7f3c0ca1790c362b89c31963e07617241c1903f602 EBUILD kubectl-1.27.3.ebuild 873 BLAKE2B 82074aa2427e6cab6cb1e551b9703c1abcefbf7af7784153b5a498490c90fd75a655355d54fd8af5f5751d3627ad100d75c85070c80b19042e9fbd6a2ed587a8 SHA512 320af5826b407a9f617c5c9b63d76d52541b2e7fc5d19d145a9c456578029576fd06e33403e2aae8f2c84a9c9a814e1efef8812e13f6611b9c5020a67089b844 EBUILD kubectl-1.27.4.ebuild 873 BLAKE2B 82074aa2427e6cab6cb1e551b9703c1abcefbf7af7784153b5a498490c90fd75a655355d54fd8af5f5751d3627ad100d75c85070c80b19042e9fbd6a2ed587a8 SHA512 320af5826b407a9f617c5c9b63d76d52541b2e7fc5d19d145a9c456578029576fd06e33403e2aae8f2c84a9c9a814e1efef8812e13f6611b9c5020a67089b844 -EBUILD kubectl-1.28.0.ebuild 874 BLAKE2B b131bf977a6af040012cb71c43578ec1d0d2cb7183f1e03778c59aef3c0186bc5055f382cebddd19c5878035503a081277bf19abedaff5e7cbdf595810f232bc SHA512 c48ab0fdaed8d0b742879ac963dc40bfe92d0607d2a507b68edd25cc35bcbc0d6ebadd1f48112b31d3d263b8c9f21072d06f4b8c32b00a1941df5ca7ef8ec82b +EBUILD kubectl-1.28.0.ebuild 947 BLAKE2B d4eefe1b72fe49bd88e955594e24979449ba5233ba89ff832fa7ca4cd6b23355d94417a749657a349ba95b89fc3f6fa89d6671940b6cdd4387bdaa2dc95ed4ed SHA512 81bfcc79f5fef3243c0e953fe8c6434cdac96bbc4a5b10de36077fdde09f624ce7db0fb986a2b54f88de3032f4cf5ddf1b53c1c8eeeebb34c4041513b56f17a2 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb diff --git a/sys-cluster/kubectl/files/kubectl-1.28.0-make-gomaxprocs-install-optional.patch b/sys-cluster/kubectl/files/kubectl-1.28.0-make-gomaxprocs-install-optional.patch new file mode 100644 index 000000000000..1a8935b31c9c --- /dev/null +++ b/sys-cluster/kubectl/files/kubectl-1.28.0-make-gomaxprocs-install-optional.patch @@ -0,0 +1,78 @@ +From cce3f6ffa796ea416021b0d62567a3f52b979567 Mon Sep 17 00:00:00 2001 +From: Jordan Liggitt <liggitt@google.com> +Date: Wed, 16 Aug 2023 09:33:02 -0400 +Subject: [PATCH 2/2] Make gomaxprocs install optional, limit to tests + +--- + hack/lib/golang.sh | 25 +++++++++++++++---------- + hack/make-rules/test-e2e-node.sh | 1 + + hack/make-rules/test.sh | 1 + + 3 files changed, 17 insertions(+), 10 deletions(-) + +diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh +index 66772f08a81..983ff368e25 100755 +--- a/hack/lib/golang.sh ++++ b/hack/lib/golang.sh +@@ -556,20 +556,25 @@ kube::golang::setup_env() { + + # This seems to matter to some tools + export GO15VENDOREXPERIMENT=1 ++} + ++kube::golang::setup_gomaxprocs() { + # GOMAXPROCS by default does not reflect the number of cpu(s) available + # when running in a container, please see https://github.com/golang/go/issues/33803 +- if ! command -v ncpu >/dev/null 2>&1; then +- # shellcheck disable=SC2164 +- pushd "${KUBE_ROOT}/hack/tools" >/dev/null +- GO111MODULE=on go install ./ncpu +- # shellcheck disable=SC2164 +- popd >/dev/null ++ if [[ -z "${GOMAXPROCS:-}" ]]; then ++ if ! command -v ncpu >/dev/null 2>&1; then ++ # shellcheck disable=SC2164 ++ pushd "${KUBE_ROOT}/hack/tools" >/dev/null ++ GO111MODULE=on go install ./ncpu || echo "Will not automatically set GOMAXPROCS" ++ # shellcheck disable=SC2164 ++ popd >/dev/null ++ fi ++ if command -v ncpu >/dev/null 2>&1; then ++ GOMAXPROCS=$(ncpu) ++ export GOMAXPROCS ++ kube::log::status "Set GOMAXPROCS automatically to ${GOMAXPROCS}" ++ fi + fi +- +- GOMAXPROCS=${GOMAXPROCS:-$(ncpu)} +- export GOMAXPROCS +- kube::log::status "Setting GOMAXPROCS: ${GOMAXPROCS}" + } + + # This will take binaries from $GOPATH/bin and copy them to the appropriate +diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh +index 43dde0c740f..49e3e04ac71 100755 +--- a/hack/make-rules/test-e2e-node.sh ++++ b/hack/make-rules/test-e2e-node.sh +@@ -18,6 +18,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../.. + source "${KUBE_ROOT}/hack/lib/init.sh" + + kube::golang::setup_env ++kube::golang::setup_gomaxprocs + + # start the cache mutation detector by default so that cache mutators will be found + KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}" +diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh +index e9074678a8f..4aa72730d83 100755 +--- a/hack/make-rules/test.sh ++++ b/hack/make-rules/test.sh +@@ -22,6 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../.. + source "${KUBE_ROOT}/hack/lib/init.sh" + + kube::golang::setup_env ++kube::golang::setup_gomaxprocs + + # start the cache mutation detector by default so that cache mutators will be found + KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}" +-- +2.41.0 + diff --git a/sys-cluster/kubectl/kubectl-1.28.0.ebuild b/sys-cluster/kubectl/kubectl-1.28.0.ebuild index ffa067f3b06c..e535262df193 100644 --- a/sys-cluster/kubectl/kubectl-1.28.0.ebuild +++ b/sys-cluster/kubectl/kubectl-1.28.0.ebuild @@ -18,6 +18,10 @@ BDEPEND=">=dev-lang/go-1.20" RESTRICT+=" test" S="${WORKDIR}/kubernetes-${PV}" +PATCHES=( + "${FILESDIR}"/${P}-make-gomaxprocs-install-optional.patch + ) + src_compile() { CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \ emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN} diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest index eef2c49b275a..1d49cb12657f 100644 --- a/sys-cluster/kubelet/Manifest +++ b/sys-cluster/kubelet/Manifest @@ -1,3 +1,4 @@ +AUX kubelet-1.28.0-make-gomaxprocs-install-optional.patch 2835 BLAKE2B 964759a3af2afced4d5ff2ed59b1e94c2912a85ce560f3dac4e0ea59b1e308ee7b35f6d5435524e6e407d2032a1bd8783fb0b4787dbb22cfa9ace9ff723b1c40 SHA512 88b369bfda14eb03f9957f4b9105a565fa6f821e20b4743941f12f7e5b005cdef4184e0c09d54102b811e08a27f1725b0dc36e29e331f8802b7eaf52db1ce00f AUX kubelet.confd 58 BLAKE2B 5c01a2146beacf3a024f312d1bd3422055887ba48d5d869a32a2be99585f260f9d9b9946e57290345e0d57870f7d4509892c53fe4c7a63b0111b1fa8f464daf0 SHA512 2ae3bbc8a66da644b59d7f753294ad43d5675edbe2e4769b91d7c988d0eeffd5b4209a10650ad937f9698b1b6050279d448c75274815a6b348ad2023f2fef08e AUX kubelet.env 547 BLAKE2B db9144a0e155450f08a665700edbb05f3fa093d209f72320fdbcd54756afb857928a1d5828e79d3a54f958ddc41e8129a1489927115d1fc7712cd682699d3ac6 SHA512 3359ef337a27ea41b3db216808bb0baa571916bab37f913da79e0c9270199d75cfbb1a5730739b9207525e6027e38e8467e4c0b98567499d36130804f218e006 AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a00585489864c262d90ad8347763753f99eccec6fe6670c6fa016674dee4dea0fa838991abb503db97bd983a SHA512 c6b9bcdb6d063728ef2e9d67673ea29c0972e70e446be9c020cfd277a7bbcfc955a5ad7a72ab0ca1579a4d04b0fc4ac71ee20e6dba9d9a9a9099efcad3c139d0 @@ -20,5 +21,5 @@ EBUILD kubelet-1.26.6.ebuild 1030 BLAKE2B 2f979623733f7f34b8f562572e1ac9b39c67d0 EBUILD kubelet-1.26.7.ebuild 1030 BLAKE2B 2f979623733f7f34b8f562572e1ac9b39c67d0ddb72ea366abd2e8eb7dc9fbbf655707374c479fdeb183739f06ed75bcf00732ab58eaed86db7c7c1db9ff10ef SHA512 0efd37f41d1e79af8e7febd651e532e17b3c04b1462d016131d4d5f75766928ed7b43bbef7a7728a3af4b0e6a948684ac63bc054794d2f6cfa32bbaddd46aa90 EBUILD kubelet-1.27.3.ebuild 1030 BLAKE2B e268e8d6e17c449e1e1f3b634b01a1ba8909454f796c4a96f28657f8122e70c1980b32cf3287d3668b3efb8d6d7cd1c5b06d2761dcba368431e772c371d30430 SHA512 a4c62f700caaba247646ce4c5f5d23e832d1d0334b5ef406e97e684833482e66b93b3951949fb74d75533e7c8a932fc261adaf52dd7a39abc35eb14a26a7e777 EBUILD kubelet-1.27.4.ebuild 1030 BLAKE2B e268e8d6e17c449e1e1f3b634b01a1ba8909454f796c4a96f28657f8122e70c1980b32cf3287d3668b3efb8d6d7cd1c5b06d2761dcba368431e772c371d30430 SHA512 a4c62f700caaba247646ce4c5f5d23e832d1d0334b5ef406e97e684833482e66b93b3951949fb74d75533e7c8a932fc261adaf52dd7a39abc35eb14a26a7e777 -EBUILD kubelet-1.28.0.ebuild 1031 BLAKE2B 73020b5c8a932f632fda1f65b566bf79adca8e448ccdb20bc73167c01cc524673b4dd81e7d07f0cf135803ec994d20e2e8f4d0138c7a890b38b7791e4c9e720b SHA512 6eec003a78eac972c8f01f1228a2282ba632e8d62317706f1bafc4f1213b548cf479a551b75835d01dbee9679bfb5d7c3f346db1b98ba4fcbabeb343876192a1 +EBUILD kubelet-1.28.0.ebuild 1103 BLAKE2B f32dd6ef29016fbebe25e9c061594f822fc83808d224d47b224dac2d2ecaed191b2884f0133d8a0d166a6201244e8d6cc2da69ba9303d8bb48eb1289521bd6fe SHA512 c64a03be394d7431de34653473bfec0c87e1e7d9610c8be51b4a13759dacf486fcabbd488db1b819975f5b2cb302e544b7338c2b3d7c7498a47d4b74897016d1 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb diff --git a/sys-cluster/kubelet/files/kubelet-1.28.0-make-gomaxprocs-install-optional.patch b/sys-cluster/kubelet/files/kubelet-1.28.0-make-gomaxprocs-install-optional.patch new file mode 100644 index 000000000000..1a8935b31c9c --- /dev/null +++ b/sys-cluster/kubelet/files/kubelet-1.28.0-make-gomaxprocs-install-optional.patch @@ -0,0 +1,78 @@ +From cce3f6ffa796ea416021b0d62567a3f52b979567 Mon Sep 17 00:00:00 2001 +From: Jordan Liggitt <liggitt@google.com> +Date: Wed, 16 Aug 2023 09:33:02 -0400 +Subject: [PATCH 2/2] Make gomaxprocs install optional, limit to tests + +--- + hack/lib/golang.sh | 25 +++++++++++++++---------- + hack/make-rules/test-e2e-node.sh | 1 + + hack/make-rules/test.sh | 1 + + 3 files changed, 17 insertions(+), 10 deletions(-) + +diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh +index 66772f08a81..983ff368e25 100755 +--- a/hack/lib/golang.sh ++++ b/hack/lib/golang.sh +@@ -556,20 +556,25 @@ kube::golang::setup_env() { + + # This seems to matter to some tools + export GO15VENDOREXPERIMENT=1 ++} + ++kube::golang::setup_gomaxprocs() { + # GOMAXPROCS by default does not reflect the number of cpu(s) available + # when running in a container, please see https://github.com/golang/go/issues/33803 +- if ! command -v ncpu >/dev/null 2>&1; then +- # shellcheck disable=SC2164 +- pushd "${KUBE_ROOT}/hack/tools" >/dev/null +- GO111MODULE=on go install ./ncpu +- # shellcheck disable=SC2164 +- popd >/dev/null ++ if [[ -z "${GOMAXPROCS:-}" ]]; then ++ if ! command -v ncpu >/dev/null 2>&1; then ++ # shellcheck disable=SC2164 ++ pushd "${KUBE_ROOT}/hack/tools" >/dev/null ++ GO111MODULE=on go install ./ncpu || echo "Will not automatically set GOMAXPROCS" ++ # shellcheck disable=SC2164 ++ popd >/dev/null ++ fi ++ if command -v ncpu >/dev/null 2>&1; then ++ GOMAXPROCS=$(ncpu) ++ export GOMAXPROCS ++ kube::log::status "Set GOMAXPROCS automatically to ${GOMAXPROCS}" ++ fi + fi +- +- GOMAXPROCS=${GOMAXPROCS:-$(ncpu)} +- export GOMAXPROCS +- kube::log::status "Setting GOMAXPROCS: ${GOMAXPROCS}" + } + + # This will take binaries from $GOPATH/bin and copy them to the appropriate +diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh +index 43dde0c740f..49e3e04ac71 100755 +--- a/hack/make-rules/test-e2e-node.sh ++++ b/hack/make-rules/test-e2e-node.sh +@@ -18,6 +18,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../.. + source "${KUBE_ROOT}/hack/lib/init.sh" + + kube::golang::setup_env ++kube::golang::setup_gomaxprocs + + # start the cache mutation detector by default so that cache mutators will be found + KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}" +diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh +index e9074678a8f..4aa72730d83 100755 +--- a/hack/make-rules/test.sh ++++ b/hack/make-rules/test.sh +@@ -22,6 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../.. + source "${KUBE_ROOT}/hack/lib/init.sh" + + kube::golang::setup_env ++kube::golang::setup_gomaxprocs + + # start the cache mutation detector by default so that cache mutators will be found + KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}" +-- +2.41.0 + diff --git a/sys-cluster/kubelet/kubelet-1.28.0.ebuild b/sys-cluster/kubelet/kubelet-1.28.0.ebuild index cd8a1735b583..54fbe2ed430d 100644 --- a/sys-cluster/kubelet/kubelet-1.28.0.ebuild +++ b/sys-cluster/kubelet/kubelet-1.28.0.ebuild @@ -19,6 +19,10 @@ RDEPEND="selinux? ( sec-policy/selinux-kubernetes )" RESTRICT+=" test " S="${WORKDIR}/kubernetes-${PV}" +PATCHES=( + "${FILESDIR}"/${P}-make-install-gomaxprocs-optional.patch +) + src_compile() { CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \ emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN} |