nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: use .SILENT instead of adding @ to each recipe

Browse Source
This commit is contained in:
Matthias Schiffer 2020-03-14 19:15:24 +01:00 committed by Martin Weinelt
parent 4e02d9ba9f
commit 2a8943e516
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Makefile
View File

@ -61,25 +61,23 @@ 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 :=
@ -119,23 +117,23 @@ endef
define CheckSite 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 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 exit 1
fi fi
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
define merge_lists define merge_lists
$(1) := $(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 := openwrt/staging_dir/hostpkg/bin/lua
$(LUA): $(LUA):
+@ +
$(CheckExternal) $(CheckExternal)
@ -176,7 +174,7 @@ $(LUA):
config: $(LUA) FORCE config: $(LUA) FORCE
+@ +
$(CheckExternal) $(CheckExternal)
$(CheckTarget) $(CheckTarget)
@ -194,7 +192,7 @@ config: $(LUA) FORCE
all: config all: config
+@ +
$(GLUON_ENV) \ $(GLUON_ENV) \
$(LUA) scripts/clean_output.lua $(LUA) scripts/clean_output.lua
$(OPENWRTMAKE) $(OPENWRTMAKE)
@ -202,16 +200,15 @@ all: config
$(LUA) scripts/copy_output.lua '$(GLUON_TARGET)' $(LUA) scripts/copy_output.lua '$(GLUON_TARGET)'
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)
@ -235,3 +232,4 @@ FORCE: ;
.PHONY: FORCE .PHONY: FORCE
.NOTPARALLEL: .NOTPARALLEL:
.ONESHELL: .ONESHELL:
.SILENT: