diff options
| author | Mateusz MikuĊa <matti@marinelayer.io> | 2017-12-07 11:16:50 +0100 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2017-12-14 13:22:16 +0000 |
| commit | 160eff4125d01b39391dd1724a40a8323f47c6aa (patch) | |
| tree | 30b47ac5b6a0e19b5bba2b939229ce84fd0f7974 /testing/kubernetes/no-gnu-grep.patch | |
| parent | a7de03d0308496ecd4cb9ae6883037b50e22870b (diff) | |
| download | aports-160eff4125d01b39391dd1724a40a8323f47c6aa.tar.bz2 aports-160eff4125d01b39391dd1724a40a8323f47c6aa.tar.xz | |
testing/kubernetes: update to version 1.8.5
Diffstat (limited to 'testing/kubernetes/no-gnu-grep.patch')
| -rw-r--r-- | testing/kubernetes/no-gnu-grep.patch | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/testing/kubernetes/no-gnu-grep.patch b/testing/kubernetes/no-gnu-grep.patch index 191b3ed404..2607906042 100644 --- a/testing/kubernetes/no-gnu-grep.patch +++ b/testing/kubernetes/no-gnu-grep.patch @@ -1,8 +1,6 @@ -diff --git a/build/root/Makefile.generated_files b/build/root/Makefile.generated_files -index 45287dc..8617f49 100644 ---- a/build/root/Makefile.generated_files -+++ b/build/root/Makefile.generated_files -@@ -155,7 +155,7 @@ $(foreach dir, $(ALL_GO_DIRS), $(eval \ +--- kubernetes-1.8.4/build/root/Makefile.generated_files.orig ++++ kubernetes-1.8.4/build/root/Makefile.generated_files +@@ -155,7 +155,7 @@ # is what the .stamp file represents. $(foreach dir, $(ALL_GO_DIRS), \ $(META_DIR)/$(dir)/$(GOFILES_META)): @@ -10,8 +8,8 @@ index 45287dc..8617f49 100644 + FILES=$$(ls $</*.go | grep -v $(GENERATED_FILE_PREFIX)); \ mkdir -p $(@D); \ echo "gofiles__$< := $$(echo $${FILES})" >$@.tmp; \ - cmp -s $@.tmp $@ || touch $@.stamp; \ -@@ -181,7 +181,7 @@ ifeq ($(DBG_MAKEFILE),1) + if ! cmp -s $@.tmp $@; then \ +@@ -187,7 +187,7 @@ endif ALL_K8S_TAG_FILES := $(shell \ find $(ALL_GO_DIRS) -maxdepth 1 -type f -name \*.go \ @@ -20,7 +18,7 @@ index 45287dc..8617f49 100644 ) # -@@ -208,7 +208,7 @@ ifeq ($(DBG_MAKEFILE),1) +@@ -214,7 +214,7 @@ $(warning ***** finding all +k8s:deepcopy-gen tags) endif DEEPCOPY_DIRS := $(shell \ @@ -29,16 +27,16 @@ index 45287dc..8617f49 100644 | xargs -n1 dirname \ | LC_ALL=C sort -u \ ) -@@ -275,7 +275,7 @@ $(META_DIR)/$(DEEPCOPY_GEN).mk: +@@ -289,7 +289,7 @@ ./hack/run-in-gopath.sh go list \ -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ - ./cmd/libs/go2idl/deepcopy-gen \ + ./vendor/k8s.io/code-generator/cmd/deepcopy-gen \ - | grep --color=never "^$(PRJ_SRC_PATH)/" \ + | grep "^$(PRJ_SRC_PATH)/" \ | xargs ./hack/run-in-gopath.sh go list \ -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}' \ | paste -sd' ' - \ -@@ -332,7 +332,7 @@ ifeq ($(DBG_MAKEFILE),1) +@@ -352,7 +352,7 @@ $(warning ***** finding all +k8s:defaulter-gen tags) endif DEFAULTER_DIRS := $(shell \ @@ -47,16 +45,16 @@ index 45287dc..8617f49 100644 | xargs -n1 dirname \ | LC_ALL=C sort -u \ ) -@@ -425,7 +425,7 @@ $(META_DIR)/$(DEFAULTER_GEN).mk: +@@ -453,7 +453,7 @@ ./hack/run-in-gopath.sh go list \ -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ - ./cmd/libs/go2idl/defaulter-gen \ + ./vendor/k8s.io/code-generator/cmd/defaulter-gen \ - | grep --color=never "^$(PRJ_SRC_PATH)/" \ + | grep "^$(PRJ_SRC_PATH)/" \ | xargs ./hack/run-in-gopath.sh go list \ -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}' \ | paste -sd' ' - \ -@@ -472,7 +472,7 @@ ifeq ($(DBG_MAKEFILE),1) +@@ -506,7 +506,7 @@ $(warning ***** finding all +k8s:openapi-gen tags) endif OPENAPI_DIRS := $(shell \ @@ -65,16 +63,16 @@ index 45287dc..8617f49 100644 | xargs -n1 dirname \ | LC_ALL=C sort -u \ ) -@@ -523,7 +523,7 @@ $(META_DIR)/$(OPENAPI_GEN).mk: +@@ -557,7 +557,7 @@ ./hack/run-in-gopath.sh go list \ -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ - ./cmd/libs/go2idl/openapi-gen \ + ./vendor/k8s.io/code-generator/cmd/openapi-gen \ - | grep --color=never "^$(PRJ_SRC_PATH)/" \ + | grep "^$(PRJ_SRC_PATH)/" \ | xargs ./hack/run-in-gopath.sh go list \ -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}' \ | paste -sd' ' - \ -@@ -581,7 +581,7 @@ ifeq ($(DBG_MAKEFILE),1) +@@ -621,7 +621,7 @@ $(warning ***** finding all +k8s:conversion-gen tags) endif CONVERSION_DIRS := $(shell \ @@ -83,19 +81,19 @@ index 45287dc..8617f49 100644 | cut -f1 -d: \ | xargs -n1 dirname \ | LC_ALL=C sort -u \ -@@ -639,7 +639,7 @@ $(foreach dir, $(CONVERSION_DIRS), $(eval \ +@@ -683,7 +683,7 @@ # is what the .stamp file represents. $(foreach dir, $(CONVERSION_DIRS), \ $(META_DIR)/$(dir)/$(CONVERSIONS_META)): - TAGS=$$(grep --color=never -h '^// *+k8s:conversion-gen=' $</*.go \ + TAGS=$$(grep -h '^// *+k8s:conversion-gen=' $</*.go \ | cut -f2- -d= \ - | sed 's|$(PRJ_SRC_PATH)/||'); \ - mkdir -p $(@D); \ -@@ -717,7 +717,7 @@ $(META_DIR)/$(CONVERSION_GEN).mk: + | sed 's|$(PRJ_SRC_PATH)/||' \ + | sed 's|^k8s.io/|vendor/k8s.io/|'); \ +@@ -771,7 +771,7 @@ ./hack/run-in-gopath.sh go list \ -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ - ./cmd/libs/go2idl/conversion-gen \ + ./vendor/k8s.io/code-generator/cmd/conversion-gen \ - | grep --color=never "^$(PRJ_SRC_PATH)/" \ + | grep "^$(PRJ_SRC_PATH)/" \ | xargs ./hack/run-in-gopath.sh go list \ |