From 2a8943e516e61aeefe45e432a371849ead30a47a Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 14 Mar 2020 19:15:24 +0100
Subject: [PATCH] build: use .SILENT instead of adding @ to each recipe
---
Makefile | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/Makefile b/Makefile
index 88a437ee7..ab52cc9ac 100644
--- a/Makefile
+++ b/Makefile
@@ -61,25 +61,23 @@ unexport $(GLUON_VARS)
GLUON_ENV = $(foreach var,$(GLUON_VARS),$(var)=$(call escape,$($(var))))
show-release:
- @echo '$(GLUON_RELEASE)'
+ echo '$(GLUON_RELEASE)'
update: FORCE
- @
export $(GLUON_ENV)
scripts/update.sh
scripts/patch.sh
scripts/feeds.sh
update-patches: FORCE
- @
export $(GLUON_ENV)
scripts/update.sh
scripts/update-patches.sh
scripts/patch.sh
update-feeds: FORCE
- @$(GLUON_ENV) scripts/feeds.sh
+ $(GLUON_ENV) scripts/feeds.sh
GLUON_TARGETS :=
@@ -119,23 +117,23 @@ endef
define CheckSite
if ! GLUON_SITEDIR='$(GLUON_SITEDIR)' GLUON_SITE_CONFIG='$(1).conf' $(LUA) -e 'assert(dofile("scripts/site_config.lua")(os.getenv("GLUON_SITE_CONFIG")))'; then
- echo 'Your site configuration ($(1).conf) did not pass validation
+ echo 'Your site configuration ($(1).conf) did not pass validation'
exit 1
fi
endef
list-targets: FORCE
- @for target in $(GLUON_TARGETS); do
+ for target in $(GLUON_TARGETS); do
echo "$$target"
done
lint: lint-lua lint-sh
lint-lua: FORCE
- @scripts/lint-lua.sh
+ scripts/lint-lua.sh
lint-sh: FORCE
- @scripts/lint-sh.sh
+ scripts/lint-sh.sh
define merge_lists
$(1) :=
@@ -166,7 +164,7 @@ $(eval $(call merge_lists,GLUON_CLASS_PACKAGES_tiny,$(GLUON_FEATURE_PACKAGES_tin
LUA := openwrt/staging_dir/hostpkg/bin/lua
$(LUA):
- +@
+ +
$(CheckExternal)
@@ -176,7 +174,7 @@ $(LUA):
config: $(LUA) FORCE
- +@
+ +
$(CheckExternal)
$(CheckTarget)
@@ -194,7 +192,7 @@ config: $(LUA) FORCE
all: config
- +@
+ +
$(GLUON_ENV) \
$(LUA) scripts/clean_output.lua
$(OPENWRTMAKE)
@@ -202,16 +200,15 @@ all: config
$(LUA) scripts/copy_output.lua '$(GLUON_TARGET)'
clean download: config
- +@$(OPENWRTMAKE) $@
+ +$(OPENWRTMAKE) $@
dirclean: FORCE
- +@
+ +
[ -e openwrt/.config ] || $(OPENWRTMAKE) defconfig
$(OPENWRTMAKE) dirclean
rm -rf $(GLUON_TMPDIR) $(GLUON_OUTPUTDIR)
manifest: $(LUA) FORCE
- @
[ '$(GLUON_BRANCH)' ] || (echo 'Please set GLUON_BRANCH to create a manifest.'; false)
echo '$(GLUON_PRIORITY)' | grep -qE '^([0-9]*\.)?[0-9]+$$' || (echo 'Please specify a numeric value for GLUON_PRIORITY to create a manifest.'; false)
$(CheckExternal)
@@ -235,3 +232,4 @@ FORCE: ;
.PHONY: FORCE
.NOTPARALLEL:
.ONESHELL:
+.SILENT:
--
GitLab