Commit 29327e2b authored by Michael Shigorin's avatar Michael Shigorin

features.in/Makefile: avoid spurious backups

This doesn't look like a clean solution, whitelist should be way more reasonable; still better than dirty builddir though.
parent aea95968
...@@ -65,6 +65,8 @@ prep: ...@@ -65,6 +65,8 @@ prep:
# - "rootfs@/": copy feature's rootfs parts into BUILDDIR toplevel # - "rootfs@/": copy feature's rootfs parts into BUILDDIR toplevel
$(FEATURES): $(FEATURES):
@feat=$@; \ @feat=$@; \
args="-qab --exclude README --exclude config.mk"; \
args="$$args --exclude generate.mk --exclude generate.sh"; \
if [ -n "$(GLOBAL_DEBUG)" ]; then \ if [ -n "$(GLOBAL_DEBUG)" ]; then \
echo "** adding $$feat feature"; \ echo "** adding $$feat feature"; \
fi; \ fi; \
...@@ -92,7 +94,7 @@ $(FEATURES): ...@@ -92,7 +94,7 @@ $(FEATURES):
fi; \ fi; \
: "why this overduplication was done? (still needed)"; \ : "why this overduplication was done? (still needed)"; \
for srcdir in $$srcdirs; do \ for srcdir in $$srcdirs; do \
rsync -qab "$$srcdir/" "$(BUILDDIR)/$$dst/"; \ rsync $$args "$$srcdir/" "$(BUILDDIR)/$$dst/"; \
done; \ done; \
fi; \ fi; \
if [ -n "$(GLOBAL_DEBUG)" ]; then \ if [ -n "$(GLOBAL_DEBUG)" ]; then \
...@@ -105,7 +107,7 @@ $(FEATURES): ...@@ -105,7 +107,7 @@ $(FEATURES):
destdir="$(BUILDDIR)/$$dst/$$part"; \ destdir="$(BUILDDIR)/$$dst/$$part"; \
[ -d "$$destdir" ] || continue; \ [ -d "$$destdir" ] || continue; \
if [ "$$sub" = / -a -d "$$part" ]; then \ if [ "$$sub" = / -a -d "$$part" ]; then \
rsync -qab "$$part/" "$$destdir/"; \ rsync $$args "$$part/" "$$destdir/"; \
fi; \ fi; \
done; \ done; \
popd >&/dev/null; \ popd >&/dev/null; \
......
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