From a3569da164d51a4e938f5b95f5b34485808f7ca1 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 12 May 2020 00:54:55 +0200 Subject: [PATCH] Revert "build: use .SILENT instead of adding @ to each recipe" This reverts commit 2a8943e516e61aeefe45e432a371849ead30a47a. .SILENT gets passed down to OpenWrt make as -s through MAKEFLAGS. This hides certain messages from the build log with V=s. --- Makefile | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index f614f3d9..cc0089f2 100644 --- a/Makefile +++ b/Makefile @@ -62,23 +62,25 @@ 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 := @@ -124,23 +126,23 @@ define CheckSite 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 LUA := openwrt/staging_dir/hostpkg/bin/lua $(LUA): - + + +@ $(CheckExternal) @@ -150,7 +152,7 @@ $(LUA): config: $(LUA) FORCE - + + +@ $(CheckExternal) $(CheckTarget) @@ -164,21 +166,22 @@ config: $(LUA) FORCE all: config - + + +@ $(GLUON_ENV) $(LUA) scripts/clean_output.lua $(OPENWRTMAKE) $(GLUON_ENV) $(LUA) scripts/copy_output.lua 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) @@ -202,4 +205,3 @@ FORCE: ; .PHONY: FORCE .NOTPARALLEL: .ONESHELL: -.SILENT: