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
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
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
Anton Palgunov
mkimage-profiles
Commits
59b1ee06
Commit
59b1ee06
authored
Nov 25, 2022
by
Anton Midyukov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add STDOUT option to output log to stdout
parent
7af1eee6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
0 deletions
+11
-0
params.txt
doc/params.txt
+6
-0
log.mk
lib/log.mk
+5
-0
No files found.
doc/params.txt
View file @
59b1ee06
...
@@ -155,6 +155,12 @@ $HOME/.mkimage/profiles.mk.
...
@@ -155,6 +155,12 @@ $HOME/.mkimage/profiles.mk.
*** пусто (по умолчанию) либо строка (например, "alpha", "beta")
*** пусто (по умолчанию) либо строка (например, "alpha", "beta")
** см. image.in/Makefile
** см. image.in/Makefile
* STDOUT
** выводить сообщения при включенном DEBUG одновременно в лог и на экран
** значение:
*** 1 - включить вывод на экран, если включен DEBUG
** см. lib/log.mk
* USE_QEMU
* USE_QEMU
** использовать qemu, если архитектура не совпадает
** использовать qemu, если архитектура не совпадает
** значение:
** значение:
...
...
lib/log.mk
View file @
59b1ee06
...
@@ -24,8 +24,13 @@ GLOBAL_VERBOSE ?= $(DEBUG)
...
@@ -24,8 +24,13 @@ GLOBAL_VERBOSE ?= $(DEBUG)
ifeq (2,$(DEBUG))
ifeq (2,$(DEBUG))
SHELL += -x
SHELL += -x
endif
endif
ifeq (1,$(STDOUT))
LOG = 2>&1 | tee -a $(BUILDLOG)
LOG_STDERR = $(LOG)
else
LOG = >>$(BUILDLOG) 2>&1
LOG = >>$(BUILDLOG) 2>&1
LOG_STDERR = 2> >(tee -a $(BUILDLOG) >&2) 1>>$(BUILDLOG)
LOG_STDERR = 2> >(tee -a $(BUILDLOG) >&2) 1>>$(BUILDLOG)
endif
else
else
MAKE += -s
MAKE += -s
LOG = 2>>$(BUILDLOG) >/dev/null
LOG = 2>>$(BUILDLOG) >/dev/null
...
...
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