aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Colista <fcolista@alpinelinux.org>2016-12-14 16:24:54 +0000
committerFrancesco Colista <fcolista@alpinelinux.org>2016-12-14 16:24:54 +0000
commit72cba1805a1fb272c47984f3c583d5cb82be048c (patch)
tree4bfc4768ada5796e3cebdb0a91e38b6419059dae
parent0f52747ece7b43e5d1b3f67ea707d919819b523f (diff)
downloadalpine_aports-72cba1805a1fb272c47984f3c583d5cb82be048c.tar.bz2
alpine_aports-72cba1805a1fb272c47984f3c583d5cb82be048c.tar.xz
alpine_aports-72cba1805a1fb272c47984f3c583d5cb82be048c.zip
testing/kubernetes: get rid of gnu grep
Diffstat
-rw-r--r--testing/kubernetes/APKBUILD16
-rw-r--r--testing/kubernetes/no-gnu-grep.patch103
2 files changed, 113 insertions, 6 deletions
diff --git a/testing/kubernetes/APKBUILD b/testing/kubernetes/APKBUILD
index a7307e9262..f8b3deb566 100644
--- a/testing/kubernetes/APKBUILD
+++ b/testing/kubernetes/APKBUILD
@@ -2,16 +2,17 @@
2# Maintainer: Francesco Colista <fcolista@alpinelinux.org> 2# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
3pkgname=kubernetes 3pkgname=kubernetes
4pkgver=1.5.1 4pkgver=1.5.1
5pkgrel=0 5pkgrel=1
6pkgdesc="Container Cluster Manager for Docker" 6pkgdesc="Container Cluster Manager for Docker"
7url="http://kubernetes.io/" 7url="http://kubernetes.io/"
8arch="x86_64" 8arch="x86_64"
9license="APACHE" 9license="APACHE"
10depends="bash" 10depends="bash"
11makedepends="go rsync bash linux-headers grep findutils coreutils" 11makedepends="go rsync bash linux-headers findutils coreutils"
12install="" 12install=""
13subpackages="" 13subpackages=""
14source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz" 14source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz
15no-gnu-grep.patch"
15builddir="$srcdir"/$pkgname-$pkgver 16builddir="$srcdir"/$pkgname-$pkgver
16 17
17build() { 18build() {
@@ -28,6 +29,9 @@ package() {
28 install -d $pkgdir/var/lib/kubelet 29 install -d $pkgdir/var/lib/kubelet
29} 30}
30 31
31md5sums="bbac1e628ac4459a789b5c55ef08798d kubernetes-1.5.1.tar.gz" 32md5sums="bbac1e628ac4459a789b5c55ef08798d kubernetes-1.5.1.tar.gz
32sha256sums="629f73b8519157e863df9cf2e724c188ceff842aeafa9953727460707f615d85 kubernetes-1.5.1.tar.gz" 33165b04cecdd70c222258dd8526884147 no-gnu-grep.patch"
33sha512sums="ca86004b82d6e461e264b95b9f0eff0f0e912bae9c1075ac7b940b7b4f7a70e3d19f726d4b66c7e2aa140fd21c86d68bda32002593c31c82f158a26e4569120b kubernetes-1.5.1.tar.gz" 34sha256sums="629f73b8519157e863df9cf2e724c188ceff842aeafa9953727460707f615d85 kubernetes-1.5.1.tar.gz
355ad044c88f1943896d1a4594d1d50658efc4e0a9af12feef2447627cabb50fb7 no-gnu-grep.patch"
36sha512sums="ca86004b82d6e461e264b95b9f0eff0f0e912bae9c1075ac7b940b7b4f7a70e3d19f726d4b66c7e2aa140fd21c86d68bda32002593c31c82f158a26e4569120b kubernetes-1.5.1.tar.gz
3766f9cb208ed8074532f6013480560af44b49adca25b7e266772beaf148771af4e0d01dc42409ac81af3006036d90b822214d43fd1840d33a120dfcb0a9422a9b no-gnu-grep.patch"
diff --git a/testing/kubernetes/no-gnu-grep.patch b/testing/kubernetes/no-gnu-grep.patch
new file mode 100644
index 0000000000..4c7d1991ba
--- /dev/null
+++ b/testing/kubernetes/no-gnu-grep.patch
@@ -0,0 +1,103 @@
1diff --git a/Makefile.generated_files b/Makefile.generated_files
2index 13a4bbb..a4ea832 100644
3--- a/Makefile.generated_files
4+++ b/Makefile.generated_files
5@@ -156,7 +156,7 @@ $(foreach dir, $(ALL_GO_DIRS), $(eval \
6 # is what the .stamp file represents.
7 $(foreach dir, $(ALL_GO_DIRS), \
8 $(META_DIR)/$(dir)/$(GOFILES_META)):
9- FILES=$$(ls $</*.go | grep --color=never -v $(GENERATED_FILE_PREFIX)); \
10+ FILES=$$(ls $</*.go | grep -v $(GENERATED_FILE_PREFIX)); \
11 mkdir -p $(@D); \
12 echo "gofiles__$< := $$(echo $${FILES})" >$@.tmp; \
13 cmp -s $@.tmp $@ || touch $@.stamp; \
14@@ -182,7 +182,7 @@ ifeq ($(DBG_MAKEFILE),1)
15 endif
16 ALL_K8S_TAG_FILES := $(shell \
17 find $(ALL_GO_DIRS) -maxdepth 1 -type f -name \*.go \
18- | xargs grep --color=never -l '^// *+k8s:' \
19+ | xargs grep -l '^// *+k8s:' \
20 )
21
22 #
23@@ -209,7 +209,7 @@ ifeq ($(DBG_MAKEFILE),1)
24 $(warning ***** finding all +k8s:deepcopy-gen tags)
25 endif
26 DEEPCOPY_DIRS := $(shell \
27- grep --color=never -l '+k8s:deepcopy-gen=' $(ALL_K8S_TAG_FILES) \
28+ grep -l '+k8s:deepcopy-gen=' $(ALL_K8S_TAG_FILES) \
29 | xargs -n1 dirname \
30 | LC_ALL=C sort -u \
31 )
32@@ -278,7 +278,7 @@ $(META_DIR)/$(DEEPCOPY_GEN).mk:
33 INDIRECT=$$(go list \
34 -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \
35 ./cmd/libs/go2idl/deepcopy-gen \
36- | grep --color=never "^$(PRJ_SRC_PATH)" \
37+ | grep "^$(PRJ_SRC_PATH)" \
38 | sed 's|^$(PRJ_SRC_PATH)|./|' \
39 | xargs go list -f '{{.Dir}} {{.Dir}}/*.go'); \
40 echo $$DIRECT $$INDIRECT \
41@@ -334,7 +334,7 @@ ifeq ($(DBG_MAKEFILE),1)
42 $(warning ***** finding all +k8s:defaulter-gen tags)
43 endif
44 DEFAULTER_DIRS := $(shell \
45- grep --color=never -l '+k8s:defaulter-gen=' $(ALL_K8S_TAG_FILES) \
46+ grep -l '+k8s:defaulter-gen=' $(ALL_K8S_TAG_FILES) \
47 | xargs -n1 dirname \
48 | LC_ALL=C sort -u \
49 )
50@@ -429,7 +429,7 @@ $(META_DIR)/$(DEFAULTER_GEN).mk:
51 INDIRECT=$$(go list \
52 -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \
53 ./cmd/libs/go2idl/defaulter-gen \
54- | grep --color=never "^$(PRJ_SRC_PATH)" \
55+ | grep "^$(PRJ_SRC_PATH)" \
56 | sed 's|^$(PRJ_SRC_PATH)|./|' \
57 | xargs go list -f '{{.Dir}} {{.Dir}}/*.go'); \
58 echo $$DIRECT $$INDIRECT \
59@@ -475,7 +475,7 @@ ifeq ($(DBG_MAKEFILE),1)
60 $(warning ***** finding all +k8s:openapi-gen tags)
61 endif
62 OPENAPI_DIRS := $(shell \
63- grep --color=never -l '+k8s:openapi-gen=' $(ALL_K8S_TAG_FILES) \
64+ grep -l '+k8s:openapi-gen=' $(ALL_K8S_TAG_FILES) \
65 | xargs -n1 dirname \
66 | LC_ALL=C sort -u \
67 )
68@@ -536,7 +536,7 @@ $(META_DIR)/$(OPENAPI_GEN).mk:
69 INDIRECT=$$(go list \
70 -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \
71 ./cmd/libs/go2idl/openapi-gen \
72- | grep --color=never "^$(PRJ_SRC_PATH)" \
73+ | grep "^$(PRJ_SRC_PATH)" \
74 | sed 's|^$(PRJ_SRC_PATH)|./|' \
75 | xargs go list -f '{{.Dir}} {{.Dir}}/*.go'); \
76 echo $$DIRECT $$INDIRECT \
77@@ -593,7 +593,7 @@ ifeq ($(DBG_MAKEFILE),1)
78 $(warning ***** finding all +k8s:conversion-gen tags)
79 endif
80 CONVERSION_DIRS := $(shell \
81- grep --color=never '^// *+k8s:conversion-gen=' $(ALL_K8S_TAG_FILES) \
82+ grep '^// *+k8s:conversion-gen=' $(ALL_K8S_TAG_FILES) \
83 | cut -f1 -d: \
84 | xargs -n1 dirname \
85 | LC_ALL=C sort -u \
86@@ -651,7 +651,7 @@ $(foreach dir, $(CONVERSION_DIRS), $(eval \
87 # is what the .stamp file represents.
88 $(foreach dir, $(CONVERSION_DIRS), \
89 $(META_DIR)/$(dir)/$(CONVERSIONS_META)):
90- TAGS=$$(grep --color=never -h '^// *+k8s:conversion-gen=' $</*.go \
91+ TAGS=$$(grep -h '^// *+k8s:conversion-gen=' $</*.go \
92 | cut -f2- -d= \
93 | sed 's|$(PRJ_SRC_PATH)/||'); \
94 mkdir -p $(@D); \
95@@ -731,7 +731,7 @@ $(META_DIR)/$(CONVERSION_GEN).mk:
96 INDIRECT=$$(go list \
97 -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \
98 ./cmd/libs/go2idl/conversion-gen \
99- | grep --color=never "^$(PRJ_SRC_PATH)" \
100+ | grep "^$(PRJ_SRC_PATH)" \
101 | sed 's|^$(PRJ_SRC_PATH)|./|' \
102 | xargs go list -f '{{.Dir}} {{.Dir}}/*.go'); \
103 echo $$DIRECT $$INDIRECT \
© 2015 Mike Crute