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

logging tweaks for better readability

Browse Source 
...and create a symlink to a just-built image from builddir too.
This commit is contained in:
Michael Shigorin 2011-10-21 20:17:57 +04:00
parent 77115ff50b
commit 0a8490ad7f
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features.in/Makefile
View File

@ -66,7 +66,7 @@ all:
else \
the="toplevel"; \
fi && \
git commit -qam "$$feat feature ($$the part)"; \
git commit -qam "$$feat feature: $$the part added"; \
popd; \
fi; \
done; \

4
image.in/Makefile
View File

@ -1,6 +1,7 @@
# stage 4: dive into mkimage
GLOBAL_BUILDDIR ?= $(shell pwd)
LINKPREFIX := mkimage-profiles
include distcfg.mk
include functions.mk
@ -39,7 +40,8 @@ postprocess:
@OUTPATH="$(IMAGEDIR)/$(IMAGE_OUTFILE)"; \
echo "** image: $(IMAGE_OUTFILE)" && \
ln -sf "$(IMAGE_OUTFILE)" "$(IMAGEDIR)/$(IMAGE_FILE)" && \
ln -sf "$(IMAGE_FILE)" "$(IMAGEDIR)/mkimage-profiles.$(IMAGE_TYPE)"; \
ln -sf "$(IMAGE_FILE)" "$(IMAGEDIR)/$(LINKPREFIX).$(IMAGE_TYPE)"; \
ln -sf "$$OUTPATH" "$(IMAGE_FILE)"; \
if [ -n "$(GLOBAL_DEBUG)" ]; then \
cp -a build.log "$$OUTPATH.log"; \
cp -a distcfg.mk "$$OUTPATH.cfg"; \

16
lib/profile.mk
View File

@ -41,11 +41,11 @@ profile/init: distclean
echo; \
} $(LOG)
@mkdir "$(BUILDDIR)"/.mki # mkimage toplevel marker
@type -t git >&/dev/null && \
cd $(BUILDDIR) && \
@if type -t git >&/dev/null && cd $(BUILDDIR); then \
git init -q && \
git add . && \
git commit -qam 'distribution profile initialized'
git commit -qam 'derivative profile initialized'; \
fi
@rm -f "$(SYMLINK)" && \
if [ -w . ]; then \
ln -sf "$(BUILDDIR)" "$(SYMLINK)" && \
@ -61,10 +61,20 @@ profile/bare: profile/init
@$(call try,IMAGEDIR,$(IMAGEDIR))
@$(call try,BRANDING,altlinux-sisyphus)
@$(call set,IMAGE_INIT_LIST,+branding-$$(BRANDING)-release)
@if type -t git >&/dev/null && cd $(BUILDDIR); then \
git init -q && \
git add . && \
git commit -qam 'image configuration defaults set'; \
fi
profile/finalize:
@if [ -s $(RC) ]; then $(call put,-include $(RC)); fi
@$(call put,endif)
@if type -t git >&/dev/null && cd $(BUILDDIR); then \
git init -q && \
git add . && \
git commit -qam 'image configuration finalized'; \
fi
# requires already formed distcfg.mk for useful output
profile/dump-vars: