Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mkimage-profiles
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ximper Linux
mkimage-profiles
Commits
9fc8689d
Commit
9fc8689d
authored
Apr 10, 2022
by
Anton Midyukov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
log.mk, profile.mk: Output errors Step 3 to BUILDLOG and on screen
parent
dad8f98e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
log.mk
lib/log.mk
+2
-0
profile.mk
lib/profile.mk
+2
-1
No files found.
lib/log.mk
View file @
9fc8689d
...
@@ -25,9 +25,11 @@ ifeq (2,$(DEBUG))
...
@@ -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)))
...
...
lib/profile.mk
View file @
9fc8689d
...
@@ -132,7 +132,8 @@ profile/dump-vars:
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment