Date: Saturday, December 12, 2020 @ 18:51:02 Author: dvzrv Revision: 773609
upgpkg: kubernetes 1.20.0-1: Upgrade to 1.20.0. Update patch for fixing gotags. Added: kubernetes/trunk/kubernetes-1.20.0-gotags.patch Modified: kubernetes/trunk/PKGBUILD Deleted: kubernetes/trunk/kubernetes-gotags.patch --------------------------------+ PKGBUILD | 16 ++++++++-------- kubernetes-1.20.0-gotags.patch | 12 ++++++++++++ kubernetes-gotags.patch | 13 ------------- 3 files changed, 20 insertions(+), 21 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-12-12 18:03:12 UTC (rev 773608) +++ PKGBUILD 2020-12-12 18:51:02 UTC (rev 773609) @@ -2,8 +2,8 @@ pkgbase=kubernetes pkgname=('kube-apiserver' 'kube-controller-manager' 'kube-proxy' 'kube-scheduler' 'kubectl' 'kubelet' 'kubeadm') -pkgver=1.19.4 -pkgrel=2 +pkgver=1.20.0 +pkgrel=1 pkgdesc="Production-Grade Container Scheduling and Management" arch=('x86_64') url="https://kubernetes.io/" @@ -12,7 +12,7 @@ makedepends=('cni-plugins' 'conntrack-tools' 'ebtables' 'ethtool' 'git' 'go' 'go-bindata' 'go-md2man' 'iptables' 'socat' 'rsync') source=("https://github.com/kubernetes/kubernetes/archive/v${pkgver}/kubernetes-${pkgver}.tar.gz" - "${pkgbase}-gotags.patch" + "${pkgbase}-1.20.0-gotags.patch" "10-kubeadm-kubelet.conf" "50-kubelet-sysctl.conf" "kubelet-modules.conf" @@ -29,8 +29,8 @@ "kube-scheduler.env" "kube-scheduler.service" ) -sha512sums=('b5a2cd73db3b1454c54d500d21630c971b5dae94377180e658638384ef2b243f0b41f1ce00eb425ab5958bddbdc0c792be4f14b9b61a364a90992860ca9109da' - '41a3ac1b849a8cfd824b21f5f3c0344a5b2342c51d33f2a79d3d25731a903e9338864faca495285868669be6926d7a9ce44febf40ecd2d40dec7cb1d79cb40b7' +sha512sums=('d04967ca858c05eb52ea46fbd5415cadb86e2ceb88481f523de2779c68dfc5eacdab033ccd873ba2c4b23e843d97b9f01400d058b421ddc618ea2b2ef751e24b' + 'a2c97738fb49c0e30eee44b6404af083bbaddbafb8a3fa92493802065f4ac06f0c09d50437a9fdda345e0365de984d9bc768fb9300a40c716e6dec53bd57b6de' '5f7132636b6afe9f00dc450c58073c0829942fa44070e7ec5a2c227c485c83f076bdea081d207f926b44d02700be65bf19a61f5d8d1472edd480f980e6ffbc3a' 'ed5ba22b37eaa9f4950ff3b57d60dd7866fcd5b8bd5197eab3170470528e8d91379483d3eb724589e695184f9b0ed506ebaee73ecca0dc40afdb5f35e79d178a' 'c318b64a03da07dfe435b2d8c368e55b0ab567da78c57ed814a7864fa75aeac52b28cf562b4afd8daa52168af93b318c1fead557ee676e950af25d422c276a17' @@ -46,8 +46,8 @@ 'dd4efa137462905f9e29a99d69b747ae35e58ba8152794bfa417325953dd5059bad96fabfabf73ce1ee2310dc4ab4d1b95c8d931d33b81c67addcb614a51be54' 'ba277f765959ddb8aa0dee5a86cd9df1f40fb3f6ea1001f24825dbf21bd9342981d13894301170431729f76e710f70c23481e4061c64be29517ff497490f1ef3' '2c25c0e11a7b2d6d61e03f9afe7ba21f9497495ab02e85f2623ce8c71019fb8a1af16197ab3968d5da050c2188c3e67372aa43322ac91af84f7da61bf73596bc') -b2sums=('a3402abbd524ba135b7fa5ae9451743da44e7691e9b646de01b265078d89099440e7d14b56b21f4b2f0e105825d51c9565b62d7ae81b644f2a0a0dde4f40122a' - '9ccfe1fcee65e414bba3de3000c1c444590a662259d194c4c6b9fe4ad03dbd687350d7ee1f750b39224f298304eb0b18daa965cde2fcd3bce42e8c903062c30b' +b2sums=('8bcb34cd3e62f241caa21706f95f010cb5962b697799fcbfba62c67bfb786c3cdcac61b444676fa90952d4ac0d997364202c3797f963c8fcf60d69deca235ba5' + 'a84c41a2b2be6ab0f5f6c3ede13b28456deb7098421a6f1af0e72e53a9214efa30a59709c5b1e6c35031c4dfd15e786a691b69e592796d769cf057fb1d21379a' 'dbab30d7e1b566027fec9d6a95dd41ed8f64399c39aac07fb4513ce21050eeeb4a226adfd513f76921c305945dfa4a140602ede574dd5eb4cd287e0f2df21714' '27a8dcbbe06fa7aea122fc87ca663710ae2179c995270d94e22c905422e2639f3c9c81eef6723467c76366062381d8bd65e84ef79f47fed7c240973a55f5cb0e' 'a03b8a2ce6a606068cad278c6b8039181968c132a935448bf45e1b3668357487da1528569ed582b107db0654a1614b784a73c726729aad42abed18a4c15ce5b6' @@ -67,7 +67,7 @@ prepare() { cd "${pkgbase}-${pkgver}" # the -tags can only be a space separated list - patch -Np1 -i ../"${pkgbase}-gotags.patch" + patch -Np1 -i ../"${pkgbase}-1.20.0-gotags.patch" # set CGO_ENABLED sed -E 's/(CGO_ENABLED)=0/\1=1/g' -i hack/lib/golang.sh } Added: kubernetes-1.20.0-gotags.patch =================================================================== --- kubernetes-1.20.0-gotags.patch (rev 0) +++ kubernetes-1.20.0-gotags.patch 2020-12-12 18:51:02 UTC (rev 773609) @@ -0,0 +1,12 @@ +diff -ruN a/hack/lib/golang.sh b/hack/lib/golang.sh +--- a/hack/lib/golang.sh 2020-12-04 22:45:25.000000000 +0100 ++++ b/hack/lib/golang.sh 2020-12-12 19:15:53.971460223 +0100 +@@ -793,7 +793,7 @@ + + # extract tags if any specified in GOFLAGS + # shellcheck disable=SC2001 +- gotags="selinux,notest,$(echo "${GOFLAGS:-}" | sed -e 's|.*-tags=\([^-]*\).*|\1|')" ++ gotags="selinux notest $(echo "${GOFLAGS:-}" | sed -e 's|.*-tags=\([^-]*\).*|\1|')" + + local -a targets=() + local arg Deleted: kubernetes-gotags.patch =================================================================== --- kubernetes-gotags.patch 2020-12-12 18:03:12 UTC (rev 773608) +++ kubernetes-gotags.patch 2020-12-12 18:51:02 UTC (rev 773609) @@ -1,13 +0,0 @@ -diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh -index b646bbe2edf..89d0a5cdba1 100755 ---- a/hack/lib/golang.sh -+++ b/hack/lib/golang.sh -@@ -798,7 +798,7 @@ kube::golang::build_binaries() { - - # extract tags if any specified in GOFLAGS - # shellcheck disable=SC2001 -- gotags="selinux,$(echo "${GOFLAGS:-}" | sed -e 's|.*-tags=\([^-]*\).*|\1|')" -+ gotags="selinux $(echo "${GOFLAGS:-}" | sed -e 's|.*-tags=\([^-]*\).*|\1|')" - - local -a targets=() - local arg