From 72cba1805a1fb272c47984f3c583d5cb82be048c Mon Sep 17 00:00:00 2001
From: Francesco Colista <fcolista@alpinelinux.org>
Date: Wed, 14 Dec 2016 16:24:54 +0000
Subject: [PATCH] testing/kubernetes: get rid of gnu grep
---
testing/kubernetes/APKBUILD | 16 +++--
testing/kubernetes/no-gnu-grep.patch | 103 +++++++++++++++++++++++++++
2 files changed, 113 insertions(+), 6 deletions(-)
create mode 100644 testing/kubernetes/no-gnu-grep.patch
diff --git a/testing/kubernetes/APKBUILD b/testing/kubernetes/APKBUILD
index a7307e92625a..f8b3deb566d9 100644
--- a/testing/kubernetes/APKBUILD
+++ b/testing/kubernetes/APKBUILD
@@ -2,16 +2,17 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=kubernetes
pkgver=1.5.1
-pkgrel=0
+pkgrel=1
pkgdesc="Container Cluster Manager for Docker"
url="http://kubernetes.io/"
arch="x86_64"
license="APACHE"
depends="bash"
-makedepends="go rsync bash linux-headers grep findutils coreutils"
+makedepends="go rsync bash linux-headers findutils coreutils"
install=""
subpackages=""
-source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz
+no-gnu-grep.patch"
builddir="$srcdir"/$pkgname-$pkgver
build() {
@@ -28,6 +29,9 @@ package() {
install -d $pkgdir/var/lib/kubelet
}
-md5sums="bbac1e628ac4459a789b5c55ef08798d kubernetes-1.5.1.tar.gz"
-sha256sums="629f73b8519157e863df9cf2e724c188ceff842aeafa9953727460707f615d85 kubernetes-1.5.1.tar.gz"
-sha512sums="ca86004b82d6e461e264b95b9f0eff0f0e912bae9c1075ac7b940b7b4f7a70e3d19f726d4b66c7e2aa140fd21c86d68bda32002593c31c82f158a26e4569120b kubernetes-1.5.1.tar.gz"
+md5sums="bbac1e628ac4459a789b5c55ef08798d kubernetes-1.5.1.tar.gz
+165b04cecdd70c222258dd8526884147 no-gnu-grep.patch"
+sha256sums="629f73b8519157e863df9cf2e724c188ceff842aeafa9953727460707f615d85 kubernetes-1.5.1.tar.gz
+5ad044c88f1943896d1a4594d1d50658efc4e0a9af12feef2447627cabb50fb7 no-gnu-grep.patch"
+sha512sums="ca86004b82d6e461e264b95b9f0eff0f0e912bae9c1075ac7b940b7b4f7a70e3d19f726d4b66c7e2aa140fd21c86d68bda32002593c31c82f158a26e4569120b kubernetes-1.5.1.tar.gz
+66f9cb208ed8074532f6013480560af44b49adca25b7e266772beaf148771af4e0d01dc42409ac81af3006036d90b822214d43fd1840d33a120dfcb0a9422a9b 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 000000000000..4c7d1991baca
--- /dev/null
+++ b/testing/kubernetes/no-gnu-grep.patch
@@ -0,0 +1,103 @@
+diff --git a/Makefile.generated_files b/Makefile.generated_files
+index 13a4bbb..a4ea832 100644
+--- a/Makefile.generated_files
++++ b/Makefile.generated_files
+@@ -156,7 +156,7 @@ $(foreach dir, $(ALL_GO_DIRS), $(eval \
+ # is what the .stamp file represents.
+ $(foreach dir, $(ALL_GO_DIRS), \
+ $(META_DIR)/$(dir)/$(GOFILES_META)):
+- FILES=$$(ls $</*.go | grep --color=never -v $(GENERATED_FILE_PREFIX)); \
++ FILES=$$(ls $</*.go | grep -v $(GENERATED_FILE_PREFIX)); \
+ mkdir -p $(@D); \
+ echo "gofiles__$< := $$(echo $${FILES})" >$@.tmp; \
+ cmp -s $@.tmp $@ || touch $@.stamp; \
+@@ -182,7 +182,7 @@ ifeq ($(DBG_MAKEFILE),1)
+ endif
+ ALL_K8S_TAG_FILES := $(shell \
+ find $(ALL_GO_DIRS) -maxdepth 1 -type f -name \*.go \
+- | xargs grep --color=never -l '^// *+k8s:' \
++ | xargs grep -l '^// *+k8s:' \
+ )
+
+ #
+@@ -209,7 +209,7 @@ ifeq ($(DBG_MAKEFILE),1)
+ $(warning ***** finding all +k8s:deepcopy-gen tags)
+ endif
+ DEEPCOPY_DIRS := $(shell \
+- grep --color=never -l '+k8s:deepcopy-gen=' $(ALL_K8S_TAG_FILES) \
++ grep -l '+k8s:deepcopy-gen=' $(ALL_K8S_TAG_FILES) \
+ | xargs -n1 dirname \
+ | LC_ALL=C sort -u \
+ )
+@@ -278,7 +278,7 @@ $(META_DIR)/$(DEEPCOPY_GEN).mk:
+ INDIRECT=$$(go list \
+ -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \
+ ./cmd/libs/go2idl/deepcopy-gen \
+- | grep --color=never "^$(PRJ_SRC_PATH)" \
++ | grep "^$(PRJ_SRC_PATH)" \
+ | sed 's|^$(PRJ_SRC_PATH)|./|' \
+ | xargs go list -f '{{.Dir}} {{.Dir}}/*.go'); \
+ echo $$DIRECT $$INDIRECT \
+@@ -334,7 +334,7 @@ ifeq ($(DBG_MAKEFILE),1)
+ $(warning ***** finding all +k8s:defaulter-gen tags)
+ endif
+ DEFAULTER_DIRS := $(shell \
+- grep --color=never -l '+k8s:defaulter-gen=' $(ALL_K8S_TAG_FILES) \
++ grep -l '+k8s:defaulter-gen=' $(ALL_K8S_TAG_FILES) \
+ | xargs -n1 dirname \
+ | LC_ALL=C sort -u \
+ )
+@@ -429,7 +429,7 @@ $(META_DIR)/$(DEFAULTER_GEN).mk:
+ INDIRECT=$$(go list \
+ -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \
+ ./cmd/libs/go2idl/defaulter-gen \
+- | grep --color=never "^$(PRJ_SRC_PATH)" \
++ | grep "^$(PRJ_SRC_PATH)" \
+ | sed 's|^$(PRJ_SRC_PATH)|./|' \
+ | xargs go list -f '{{.Dir}} {{.Dir}}/*.go'); \
+ echo $$DIRECT $$INDIRECT \
+@@ -475,7 +475,7 @@ ifeq ($(DBG_MAKEFILE),1)
+ $(warning ***** finding all +k8s:openapi-gen tags)
+ endif
+ OPENAPI_DIRS := $(shell \
+- grep --color=never -l '+k8s:openapi-gen=' $(ALL_K8S_TAG_FILES) \
++ grep -l '+k8s:openapi-gen=' $(ALL_K8S_TAG_FILES) \
+ | xargs -n1 dirname \
+ | LC_ALL=C sort -u \
+ )
+@@ -536,7 +536,7 @@ $(META_DIR)/$(OPENAPI_GEN).mk:
+ INDIRECT=$$(go list \
+ -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \
+ ./cmd/libs/go2idl/openapi-gen \
+- | grep --color=never "^$(PRJ_SRC_PATH)" \
++ | grep "^$(PRJ_SRC_PATH)" \
+ | sed 's|^$(PRJ_SRC_PATH)|./|' \
+ | xargs go list -f '{{.Dir}} {{.Dir}}/*.go'); \
+ echo $$DIRECT $$INDIRECT \
+@@ -593,7 +593,7 @@ ifeq ($(DBG_MAKEFILE),1)
+ $(warning ***** finding all +k8s:conversion-gen tags)
+ endif
+ CONVERSION_DIRS := $(shell \
+- grep --color=never '^// *+k8s:conversion-gen=' $(ALL_K8S_TAG_FILES) \
++ grep '^// *+k8s:conversion-gen=' $(ALL_K8S_TAG_FILES) \
+ | cut -f1 -d: \
+ | xargs -n1 dirname \
+ | LC_ALL=C sort -u \
+@@ -651,7 +651,7 @@ $(foreach dir, $(CONVERSION_DIRS), $(eval \
+ # 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); \
+@@ -731,7 +731,7 @@ $(META_DIR)/$(CONVERSION_GEN).mk:
+ INDIRECT=$$(go list \
+ -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \
+ ./cmd/libs/go2idl/conversion-gen \
+- | grep --color=never "^$(PRJ_SRC_PATH)" \
++ | grep "^$(PRJ_SRC_PATH)" \
+ | sed 's|^$(PRJ_SRC_PATH)|./|' \
+ | xargs go list -f '{{.Dir}} {{.Dir}}/*.go'); \
+ echo $$DIRECT $$INDIRECT \
--
GitLab