From 1e4427a9e742c2b2ed690fe01f5fcb58f5f204bb Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 22 Feb 2018 22:55:52 -0500 Subject: [PATCH] kubernetes: rebuild with go-1.10 - Use upstream fix for kubernetes. --- srcpkgs/kubernetes/patches/fix-version-compare.patch | 11 +++++++++++ srcpkgs/kubernetes/template | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/kubernetes/patches/fix-version-compare.patch diff --git a/srcpkgs/kubernetes/patches/fix-version-compare.patch b/srcpkgs/kubernetes/patches/fix-version-compare.patch new file mode 100644 index 00000000000..599951abd86 --- /dev/null +++ b/srcpkgs/kubernetes/patches/fix-version-compare.patch @@ -0,0 +1,11 @@ +--- hack/lib/golang.sh ++++ hack/lib/golang.sh +@@ -323,7 +323,7 @@ EOF + go_version=($(go version)) + local minimum_go_version + minimum_go_version=go1.9.1 +- if [[ "${go_version[2]}" < "${minimum_go_version}" && "${go_version[2]}" != "devel" ]]; then ++ if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then + kube::log::usage_from_stdin <