Skip to content

M
mkimage-profiles
Commit 5c49535c authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

build.mk: get rid of GREP_OPTIONS

It was superfluous in the first place indeed, and new grep(1) considers the option deprecated.
parent e37f5e13
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
lib/build.mk
View file @ 5c49535c
...@@ -66,8 +66,8 @@ build-image: profile/populate ...@@ -66,8 +66,8 @@ 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_OPTIONS="--color=auto" \ GREP_COLOR="$(ANSI_OK)" \
grep '^\*\* image: .*$$' ||:; \ grep --color=auto '^\*\* image: .*$$' ||:; \
else \ else \
echo -n "$(TIME) $$DURATION "; \ echo -n "$(TIME) $$DURATION "; \
sed -rn 's/^\*\* image: (.*)$$/\1/p'; \ sed -rn 's/^\*\* image: (.*)$$/\1/p'; \
...@@ -85,8 +85,8 @@ build-image: profile/populate ...@@ -85,8 +85,8 @@ 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_OPTIONS="--color=auto" \ | GREP_COLOR="$(ANSI_FAIL)" \
egrep -m "$(MAX_ERRORS)" "$(GOTCHA)"; \ egrep --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)"}}'; \
fi; \ fi; \
......
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