stepchenkoas/mkimage-profiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log.mk, profile.mk: Output errors Step 3 to BUILDLOG and on screen

Browse Source
This commit is contained in:
Anton Midyukov 2022-04-10 13:37:46 +07:00
parent dad8f98e65
commit 9fc8689db8
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/log.mk
View File

@ -25,9 +25,11 @@ ifeq (2,$(DEBUG))
SHELL += -x SHELL += -x
endif endif
LOG = >>$(BUILDLOG) 2>&1 LOG = >>$(BUILDLOG) 2>&1
LOG_STDERR = 2> >(tee -a $(BUILDLOG) >&2) 1>>$(BUILDLOG)
else else
MAKE += -s MAKE += -s
LOG = 2>>$(BUILDLOG) >/dev/null LOG = 2>>$(BUILDLOG) >/dev/null
LOG_STDERR = 2> >(tee -a $(BUILDLOG) >&2) 1>/dev/null
endif endif
ifeq (,$(filter-out $(DIRECT_TARGETS),$(MAKECMDGOALS))) ifeq (,$(filter-out $(DIRECT_TARGETS),$(MAKECMDGOALS)))

3
lib/profile.mk
View File

@ -132,7 +132,8 @@ profile/dump-vars:
fi $(LOG) fi $(LOG)
# step 3 entry point: copy the needed parts into BUILDDIR # step 3 entry point: copy the needed parts into BUILDDIR
profile/populate: SHELL=/bin/bash
profile/populate: profile/finalize profile/dump-vars make-aptbox profile/populate: profile/finalize profile/dump-vars make-aptbox
@for dir in sub.in features.in pkg.in; do \ @for dir in sub.in features.in pkg.in; do \
$(MAKE) -C $$dir $(LOG); \ $(MAKE) -C $$dir $(LOG_STDERR); \
done done