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

build: minor make logging adjustments

Browse Source
This commit is contained in:
Matthias Schiffer 2015-03-16 15:14:07 +01:00
parent 630de84465
commit 28f35becbf
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -85,13 +85,13 @@ toolchain/% package/% target/% image/%: FORCE
+@$(GLUONMAKE) $@ +@$(GLUONMAKE) $@
manifest: FORCE manifest: FORCE
[ -n '$(GLUON_BRANCH)' ] || (echo 'Please set GLUON_BRANCH to create a manifest.'; false) @[ -n '$(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)
@mkdir -p $(GLUON_IMAGEDIR)/sysupgrade mkdir -p $(GLUON_IMAGEDIR)/sysupgrade
@( \ ( \
echo 'BRANCH=$(GLUON_BRANCH)' && \ echo 'BRANCH=$(GLUON_BRANCH)' && \
echo 'DATE=$(shell $(GLUON_ORIGOPENWRTDIR)/staging_dir/host/bin/lua $(GLUONDIR)/scripts/rfc3339date.lua)' && \ echo 'DATE=$(shell $(GLUON_ORIGOPENWRTDIR)/staging_dir/host/bin/lua $(GLUONDIR)/scripts/rfc3339date.lua)' && \
echo 'PRIORITY=$(GLUON_PRIORITY)' && \ echo 'PRIORITY=$(GLUON_PRIORITY)' && \
@ -99,14 +99,14 @@ manifest: FORCE
) > $(GLUON_IMAGEDIR)/sysupgrade/$(GLUON_BRANCH).manifest ) > $(GLUON_IMAGEDIR)/sysupgrade/$(GLUON_BRANCH).manifest
+($(foreach GLUON_TARGET,$(GLUON_TARGETS), \ +($(foreach GLUON_TARGET,$(GLUON_TARGETS), \
( [ ! -e $(BOARD_BUILDDIR)/prepared ] || ( $(GLUONMAKE) manifest GLUON_TARGET='$(GLUON_TARGET)' ) ) && \ ( [ ! -e $(BOARD_BUILDDIR)/prepared ] || ( $(GLUONMAKE) manifest GLUON_TARGET='$(GLUON_TARGET)' V=s$(OPENWRT_VERBOSE) ) ) && \
) :) ) :)
dirclean : FORCE dirclean : FORCE
@for dir in build_dir dl staging_dir tmp; do \ for dir in build_dir dl staging_dir tmp; do \
rm -rf $(GLUON_ORIGOPENWRTDIR)/$$dir; \ rm -rf $(GLUON_ORIGOPENWRTDIR)/$$dir; \
done done
@rm -rf $(GLUON_BUILDDIR) $(GLUON_IMAGEDIR) rm -rf $(GLUON_BUILDDIR) $(GLUON_IMAGEDIR)
else else