keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reports.mk: fix launch together with the CHECK option

Browse Source 
If the CHECK option is enabled, then now the report directory is
generated successfully and is called "$(IMAGE_NAME).$(IMAGE_TYPE)".
This commit is contained in:
Anton Midyukov 2021-06-11 23:20:33 +07:00
parent 611cadc60a
commit af9dfa1636
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
reports.mk
View File

@ -10,6 +10,12 @@ REPORTDIR := $(BUILDDIR)/reports
IMAGE_OUTPATH := $(shell sed -n 's/^IMAGE_OUTPATH = \(.*\)/\1/p' $(BUILDLOG)) IMAGE_OUTPATH := $(shell sed -n 's/^IMAGE_OUTPATH = \(.*\)/\1/p' $(BUILDLOG))
IMAGE_OUTFILE := $(shell sed -n 's/^IMAGE_OUTFILE = \(.*\)/\1/p' $(BUILDLOG)) IMAGE_OUTFILE := $(shell sed -n 's/^IMAGE_OUTFILE = \(.*\)/\1/p' $(BUILDLOG))
LOGDIR := $(shell sed -n 's/^LOGDIR = \(.*\)/\1/p' $(BUILDLOG)) LOGDIR := $(shell sed -n 's/^LOGDIR = \(.*\)/\1/p' $(BUILDLOG))
ifeq (,$(IMAGE_OUTPATH))
TARGET_NAME := $(shell sed -n 's/^IMAGE_NAME = \(.*\)/\1/p' $(BUILDDIR)/distcfg.mk)
TARGET_TYPE := $(shell sed -n 's/^IMAGE_TYPE = \(.*\)/\1/p' $(BUILDDIR)/distcfg.mk)
TARGET_NAME := $(TARGET_NAME).$(TARGET_TYPE)
LOGDIR := $(LOGDIR)/CHECK
endif
# for a multi-image build there's no sense to refer to buildroot # for a multi-image build there's no sense to refer to buildroot
# contained reports as these are very ephemeral between builds # contained reports as these are very ephemeral between builds
@ -26,17 +32,21 @@ define report_body
fi; } fi; }
endef endef
ifneq (,$(IMAGE_OUTPATH))
all: reports/targets reports/scripts reports/cleanlog \ all: reports/targets reports/scripts reports/cleanlog \
reports/contents reports/packages reports/contents reports/packages
@if [ -n "$(IMAGE_OUTPATH)" ]; then \ @rm -fr "$(LOGDIR)/$(IMAGE_OUTFILE).reports"
rm -fr "$(LOGDIR)/$(IMAGE_OUTFILE).reports"; \ @cp -a "$(REPORTDIR)" "$(LOGDIR)/$(IMAGE_OUTFILE).reports"
cp -a "$(REPORTDIR)" "$(LOGDIR)/$(IMAGE_OUTFILE).reports"; \ @mv $(LOGDIR)/{$(IMAGE_OUTFILE),$(IMAGE_OUTFILE).reports/build}.log
mv $(LOGDIR)/{$(IMAGE_OUTFILE),$(IMAGE_OUTFILE).reports/build}.log; \ @mv $(LOGDIR)/{$(IMAGE_OUTFILE),$(IMAGE_OUTFILE).reports/build}.cfg
mv $(LOGDIR)/{$(IMAGE_OUTFILE),$(IMAGE_OUTFILE).reports/build}.cfg; \ else
fi all: reports/prep reports/targets reports/scripts
@rm -fr "$(LOGDIR)/$(TARGET_NAME).reports"
@cp -a "$(REPORTDIR)" "$(LOGDIR)/$(TARGET_NAME).reports"
endif
reports/prep: reports/prep:
@mkdir -p "$(REPORTDIR)" @mkdir -p "$(REPORTDIR)" "$(LOGDIR)"
# try to drop common noise rendering diff(1) mostly useless # try to drop common noise rendering diff(1) mostly useless
reports/cleanlog: reports/prep reports/cleanlog: reports/prep