Commit b5198e47 authored by Anton Midyukov's avatar Anton Midyukov

reports.mk: archive report with REPORT=2

parent 59b1ee06
...@@ -122,7 +122,10 @@ $HOME/.mkimage/profiles.mk. ...@@ -122,7 +122,10 @@ $HOME/.mkimage/profiles.mk.
* REPORT * REPORT
** запрашивает создание отчётов о собранном образе ** запрашивает создание отчётов о собранном образе
** значение: пусто (по умолчанию) либо любая строка ** значение:
** пусто (по умолчанию) - создание отчёта выключено
** 2 - создать архив из каталога отчёта
** любая другое непустое значение - создать отчёт в виде каталога
** см. Makefile, report.mk, lib/report.mk ** см. Makefile, report.mk, lib/report.mk
* ROOTPW * ROOTPW
......
...@@ -45,6 +45,10 @@ all: reports/targets reports/scripts reports/cleanlog \ ...@@ -45,6 +45,10 @@ all: reports/targets reports/scripts reports/cleanlog \
@mv $(LOGDIR)/{$(IMAGE_OUTFILE),$(IMAGE_OUTFILE).reports/build}.cfg @mv $(LOGDIR)/{$(IMAGE_OUTFILE),$(IMAGE_OUTFILE).reports/build}.cfg
@find $(BUILDDIR)/pkg/ -type f | sed 's:$(BUILDDIR)/pkg/::' > \ @find $(BUILDDIR)/pkg/ -type f | sed 's:$(BUILDDIR)/pkg/::' > \
"$(LOGDIR)/$(IMAGE_OUTFILE).reports/pkg.list" "$(LOGDIR)/$(IMAGE_OUTFILE).reports/pkg.list"
ifeq (2,$(REPORT))
@cd "$(LOGDIR)" && tar -cf "$(IMAGE_OUTFILE).reports.tar" "$(IMAGE_OUTFILE).reports" && \
rm -r "$(IMAGE_OUTFILE).reports"
endif
else else
all: reports/prep reports/targets reports/scripts all: reports/prep reports/targets reports/scripts
@rm -fr "$(LOGDIR)/$(TARGET_NAME).reports" @rm -fr "$(LOGDIR)/$(TARGET_NAME).reports"
...@@ -54,6 +58,10 @@ all: reports/prep reports/targets reports/scripts ...@@ -54,6 +58,10 @@ all: reports/prep reports/targets reports/scripts
fi fi
@find $(BUILDDIR)/pkg/ -type f | sed 's:$(BUILDDIR)/pkg/::' > \ @find $(BUILDDIR)/pkg/ -type f | sed 's:$(BUILDDIR)/pkg/::' > \
"$(LOGDIR)/$(TARGET_NAME).reports/pkg.list" "$(LOGDIR)/$(TARGET_NAME).reports/pkg.list"
ifeq (2,$(REPORT))
@cd "$(LOGDIR)" && tar -cf "$(TARGET_NAME).reports.tar" "$(TARGET_NAME).reports" && \
rm -r "$(TARGET_NAME).reports"
endif
endif endif
reports/prep: reports/prep:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment