From 399da6d176b8e025078e26815a9ce4e670da8469 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Tue, 13 Dec 2016 13:41:32 +0100 Subject: [PATCH 1/2] make: avoid dirname process per go file --- hack/make-rules/helpers/cache_go_dirs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/make-rules/helpers/cache_go_dirs.sh b/hack/make-rules/helpers/cache_go_dirs.sh index 7efc2ee869d..282022a8474 100755 --- a/hack/make-rules/helpers/cache_go_dirs.sh +++ b/hack/make-rules/helpers/cache_go_dirs.sh @@ -60,9 +60,9 @@ fi mkdir -p $(dirname "${CACHE}") if $("${NEED_FIND}"); then kfind -type f -name \*.go \ - | xargs -n1 dirname \ - | LC_ALL=C sort -u \ + | sed 's|/[^/]*$||' \ | sed 's|^./||' \ + | LC_ALL=C sort -u \ > "${CACHE}" fi cat "${CACHE}" From 036df762425097fe08d91ed3728584797313ef0b Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Tue, 13 Dec 2016 15:12:45 +0100 Subject: [PATCH 2/2] make: don't preserve rsync time, conflicting with touch on generators --- hack/lib/golang.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh index f6261b9bc7a..94fe434bb5b 100755 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh @@ -399,7 +399,7 @@ kube::golang::place_bins() { if [[ -d "${full_binpath_src}" ]]; then mkdir -p "${KUBE_OUTPUT_BINPATH}/${platform}" find "${full_binpath_src}" -maxdepth 1 -type f -exec \ - rsync -ptc {} "${KUBE_OUTPUT_BINPATH}/${platform}" \; + rsync -pc {} "${KUBE_OUTPUT_BINPATH}/${platform}" \; fi done }