Skip to content

M
mkimage-profiles
Commit e147b649 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

build.mk: replace obsoleted GREP_COLOR with GREP_COLORS

parent 3d411fe1
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
lib/build.mk
View file @ e147b649
...@@ -95,7 +95,7 @@ build-image: profile/populate ...@@ -95,7 +95,7 @@ build-image: profile/populate
tail -n $(MAX_LINES) "$(BUILDLOG)" $(SHORTEN) \ tail -n $(MAX_LINES) "$(BUILDLOG)" $(SHORTEN) \
| if [ -z "$(QUIET)" ]; then \ | if [ -z "$(QUIET)" ]; then \
echo "$(TIME) done $$DURATION"; \ echo "$(TIME) done $$DURATION"; \
GREP_COLOR="$(ANSI_OK)" \ GREP_COLORS="mt=0$(ANSI_OK)" \
grep --color=auto '^\*\* image: .*$$' ||:; \ grep --color=auto '^\*\* image: .*$$' ||:; \
else \ else \
echo -n "$(TIME) $$DURATION "; \ echo -n "$(TIME) $$DURATION "; \
...@@ -114,7 +114,7 @@ build-image: profile/populate ...@@ -114,7 +114,7 @@ build-image: profile/populate
echo "$(TIME) (you might want to rerun with DEBUG=1)"; \ echo "$(TIME) (you might want to rerun with DEBUG=1)"; \
fi; \ fi; \
tail -n $(MAX_LINES) "$(BUILDLOG)" \ tail -n $(MAX_LINES) "$(BUILDLOG)" \
| GREP_COLOR="$(ANSI_FAIL)" \ | GREP_COLORS="mt=0$(ANSI_FAIL)" \
grep -E --color=auto -m "$(MAX_ERRORS)" "$(GOTCHA)"; \ grep -E --color=auto -m "$(MAX_ERRORS)" "$(GOTCHA)"; \
df -P $(BUILDDIR) | awk 'END { if ($$4 < $(LOWSPACE)) \ df -P $(BUILDDIR) | awk 'END { if ($$4 < $(LOWSPACE)) \
{ print "NB: low space on "$$6" ("$$5" used)"}}'; \ { print "NB: low space on "$$6" ("$$5" used)"}}'; \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment