d5a5941f96
This is quite a large-scale change since mkimage-profiles got used to
baking distributions over the last year, and virtual environments are
quite different, so e.g. image.in/Makefile had to be split in two with
the main part of it moved into features.in/iso/lib/.
Short overview:
- features.in/Makefile: lib/ support
(supporting VE images requires dynamic modifications
to image.in/Makefile before starting the build;
the most natural way to achieve that seems to use
features mechanism along with makefile include dir)
- packaging format related part moved into features.in/pack
(should be better prepared for diversity either)
- features.in/iso renamed to features.in/build-distro
- features.in/ve renamed to features.in/build-ve
+ NB: these could not be merged as e.g. features.in/build
due to completely different script hooks
- lib/image.mk renamed to lib/build.mk
- image, config, log postprocessing moved downstream
- added a sort of a topping in the form of lib/sugar.mk
- assorted style fixups (like ifeq usage)
- clean.mk: reliability fix (the problem was observed by Oleg Ivanov
and me too but finally it did get the attention quantum)
- reviewed, updated and extended docs
+ QUICKSTART: should be[come] a step-by-step guide
(thanks Leo-sp50 for prodiving feedback)
81 lines
2.3 KiB
Makefile
81 lines
2.3 KiB
Makefile
# step 3: copy the needed features to $(BUILDDIR)
|
|
# (only regarding the needed subprofiles)
|
|
|
|
ifndef BUILDDIR
|
|
help all:
|
|
@echo "** BUILDDIR not defined; available features:"
|
|
@for dir in */; do \
|
|
echo -n "$$dir: "; \
|
|
grep -h '^use/' $$dir/config.mk \
|
|
| cut -f1 -d: \
|
|
| tr '\n' ' ' \
|
|
| sort -u; \
|
|
done
|
|
else
|
|
|
|
include $(BUILDDIR)/distcfg.mk
|
|
|
|
# first rsync what's static, and make backups (*~) --
|
|
# these might signal of file clashes (or plain dirt);
|
|
# second, care for toplevel and tagged script dirs;
|
|
# then handle two more ways of implementing a feature
|
|
#
|
|
# NB: some subprofiles will be specified as "src/dst"
|
|
# -- then both src/ and dst/ can hold the addons;
|
|
# still both pieces go into a single destination
|
|
|
|
### {image-,}scripts.d/ get rsynced twice :-/
|
|
### still we don't want the trimmed-down case
|
|
|
|
all:
|
|
@echo "** starting feature configuration"
|
|
@if [ -n "$(GLOBAL_DEBUG)" ]; then \
|
|
echo "** target subprofiles: $(SUBPROFILES)"; \
|
|
echo "** requested features: $(FEATURES)"; \
|
|
fi
|
|
@for feat in $(FEATURES); do \
|
|
pushd "$$feat" && \
|
|
for sub in / $(SUBPROFILES); do \
|
|
src="$${sub%/*}"; \
|
|
dst="$${sub#*/}"; \
|
|
if [ -d "$$src" ]; then rsync -qab "$$src/" "$(BUILDDIR)/$$dst/"; fi; \
|
|
if [ -d "$$dst" ]; then rsync -qab "$$dst/" "$(BUILDDIR)/$$dst/"; fi; \
|
|
for dir in lib {image-,}scripts.d; do \
|
|
destdir="$(BUILDDIR)/$$dst/$$dir/"; \
|
|
if [ -d "$$destdir" ]; then \
|
|
if [ -d "$$dir" ]; then \
|
|
rsync -qab "$$dir/" "$$destdir/"; \
|
|
fi; \
|
|
if [ -d "tagged/$$dir" ]; then \
|
|
pushd "tagged/$$dir" && \
|
|
echo "$$feat && ($$src || $$dst)" \
|
|
| tags2lists . \
|
|
| xargs -r cp -v -pLt "$$destdir" --; \
|
|
popd; \
|
|
fi; \
|
|
fi; \
|
|
done; \
|
|
type -t git >&/dev/null && \
|
|
pushd "$(BUILDDIR)/$$dst/" && \
|
|
git add . && \
|
|
if [ -n "$$dst" ]; then \
|
|
the="$$sub subprofile"; \
|
|
else \
|
|
the="toplevel"; \
|
|
fi; \
|
|
git commit -qam "$$feat feature ($$the part)" ||:; \
|
|
popd; \
|
|
done; \
|
|
if [ -x "generate.sh" ]; then sh generate.sh; fi; \
|
|
if [ -s "generate.mk" ]; then $(MAKE) -f generate.mk; fi; \
|
|
type -t git >&/dev/null && \
|
|
pushd "$(BUILDDIR)/" && \
|
|
git add . && \
|
|
git commit -qam "$$feat feature generation complete" ||:; \
|
|
popd; \
|
|
popd; \
|
|
done
|
|
@find "$(BUILDDIR)/" -name '*~' \
|
|
| sed "s,$(BUILDDIR)/,** warning: file clash: ," >&2
|
|
endif
|