Revert "build: use .SILENT instead of adding @ to each recipe"
This reverts commit 2a8943e516
.
.SILENT gets passed down to OpenWrt make as -s through MAKEFLAGS. This
hides certain messages from the build log with V=s.
This commit is contained in:
parent
4540217342
commit
a3569da164
24
Makefile
24
Makefile
@ -62,23 +62,25 @@ unexport $(GLUON_VARS)
|
|||||||
GLUON_ENV = $(foreach var,$(GLUON_VARS),$(var)=$(call escape,$($(var))))
|
GLUON_ENV = $(foreach var,$(GLUON_VARS),$(var)=$(call escape,$($(var))))
|
||||||
|
|
||||||
show-release:
|
show-release:
|
||||||
echo '$(GLUON_RELEASE)'
|
@echo '$(GLUON_RELEASE)'
|
||||||
|
|
||||||
|
|
||||||
update: FORCE
|
update: FORCE
|
||||||
|
@
|
||||||
export $(GLUON_ENV)
|
export $(GLUON_ENV)
|
||||||
scripts/update.sh
|
scripts/update.sh
|
||||||
scripts/patch.sh
|
scripts/patch.sh
|
||||||
scripts/feeds.sh
|
scripts/feeds.sh
|
||||||
|
|
||||||
update-patches: FORCE
|
update-patches: FORCE
|
||||||
|
@
|
||||||
export $(GLUON_ENV)
|
export $(GLUON_ENV)
|
||||||
scripts/update.sh
|
scripts/update.sh
|
||||||
scripts/update-patches.sh
|
scripts/update-patches.sh
|
||||||
scripts/patch.sh
|
scripts/patch.sh
|
||||||
|
|
||||||
update-feeds: FORCE
|
update-feeds: FORCE
|
||||||
$(GLUON_ENV) scripts/feeds.sh
|
@$(GLUON_ENV) scripts/feeds.sh
|
||||||
|
|
||||||
|
|
||||||
GLUON_TARGETS :=
|
GLUON_TARGETS :=
|
||||||
@ -124,23 +126,23 @@ define CheckSite
|
|||||||
endef
|
endef
|
||||||
|
|
||||||
list-targets: FORCE
|
list-targets: FORCE
|
||||||
for target in $(GLUON_TARGETS); do
|
@for target in $(GLUON_TARGETS); do
|
||||||
echo "$$target"
|
echo "$$target"
|
||||||
done
|
done
|
||||||
|
|
||||||
lint: lint-lua lint-sh
|
lint: lint-lua lint-sh
|
||||||
|
|
||||||
lint-lua: FORCE
|
lint-lua: FORCE
|
||||||
scripts/lint-lua.sh
|
@scripts/lint-lua.sh
|
||||||
|
|
||||||
lint-sh: FORCE
|
lint-sh: FORCE
|
||||||
scripts/lint-sh.sh
|
@scripts/lint-sh.sh
|
||||||
|
|
||||||
|
|
||||||
LUA := openwrt/staging_dir/hostpkg/bin/lua
|
LUA := openwrt/staging_dir/hostpkg/bin/lua
|
||||||
|
|
||||||
$(LUA):
|
$(LUA):
|
||||||
+
|
+@
|
||||||
|
|
||||||
$(CheckExternal)
|
$(CheckExternal)
|
||||||
|
|
||||||
@ -150,7 +152,7 @@ $(LUA):
|
|||||||
|
|
||||||
|
|
||||||
config: $(LUA) FORCE
|
config: $(LUA) FORCE
|
||||||
+
|
+@
|
||||||
|
|
||||||
$(CheckExternal)
|
$(CheckExternal)
|
||||||
$(CheckTarget)
|
$(CheckTarget)
|
||||||
@ -164,21 +166,22 @@ config: $(LUA) FORCE
|
|||||||
|
|
||||||
|
|
||||||
all: config
|
all: config
|
||||||
+
|
+@
|
||||||
$(GLUON_ENV) $(LUA) scripts/clean_output.lua
|
$(GLUON_ENV) $(LUA) scripts/clean_output.lua
|
||||||
$(OPENWRTMAKE)
|
$(OPENWRTMAKE)
|
||||||
$(GLUON_ENV) $(LUA) scripts/copy_output.lua
|
$(GLUON_ENV) $(LUA) scripts/copy_output.lua
|
||||||
|
|
||||||
clean download: config
|
clean download: config
|
||||||
+$(OPENWRTMAKE) $@
|
+@$(OPENWRTMAKE) $@
|
||||||
|
|
||||||
dirclean: FORCE
|
dirclean: FORCE
|
||||||
+
|
+@
|
||||||
[ -e openwrt/.config ] || $(OPENWRTMAKE) defconfig
|
[ -e openwrt/.config ] || $(OPENWRTMAKE) defconfig
|
||||||
$(OPENWRTMAKE) dirclean
|
$(OPENWRTMAKE) dirclean
|
||||||
rm -rf $(GLUON_TMPDIR) $(GLUON_OUTPUTDIR)
|
rm -rf $(GLUON_TMPDIR) $(GLUON_OUTPUTDIR)
|
||||||
|
|
||||||
manifest: $(LUA) FORCE
|
manifest: $(LUA) FORCE
|
||||||
|
@
|
||||||
[ '$(GLUON_BRANCH)' ] || (echo 'Please set GLUON_BRANCH to create a manifest.'; false)
|
[ '$(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)
|
echo '$(GLUON_PRIORITY)' | grep -qE '^([0-9]*\.)?[0-9]+$$' || (echo 'Please specify a numeric value for GLUON_PRIORITY to create a manifest.'; false)
|
||||||
$(CheckExternal)
|
$(CheckExternal)
|
||||||
@ -202,4 +205,3 @@ FORCE: ;
|
|||||||
.PHONY: FORCE
|
.PHONY: FORCE
|
||||||
.NOTPARALLEL:
|
.NOTPARALLEL:
|
||||||
.ONESHELL:
|
.ONESHELL:
|
||||||
.SILENT:
|
|
||||||
|
Loading…
Reference in New Issue
Block a user