mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-24 03:35:38 +03:00
103 lines
5.3 KiB
Diff
103 lines
5.3 KiB
Diff
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 \
|