Do not rsync .gitignore to build directories
This commit is contained in:
parent
58f650503f
commit
366cb49dbe
@ -68,7 +68,7 @@ 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="-qab --exclude .gitignore --exclude README --exclude config.mk"; \
|
||||||
args="$$args --exclude generate.mk --exclude generate.sh"; \
|
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"; \
|
||||||
|
@ -42,7 +42,7 @@ profile/init: distclean
|
|||||||
if [ -z $(QUIET) ]; then \
|
if [ -z $(QUIET) ]; then \
|
||||||
echo -n "$(TIME) initializing BUILDDIR: "; \
|
echo -n "$(TIME) initializing BUILDDIR: "; \
|
||||||
fi; \
|
fi; \
|
||||||
rsync -qaxH --delete-after image.in/ "$(BUILDDIR)"/; \
|
rsync -qaxH --exclude .gitignore --delete-after image.in/ "$(BUILDDIR)"/; \
|
||||||
mkdir "$(BUILDDIR)"/.mki; \
|
mkdir "$(BUILDDIR)"/.mki; \
|
||||||
} >&2
|
} >&2
|
||||||
@$(call put,ifndef DISTCFG_MK)
|
@$(call put,ifndef DISTCFG_MK)
|
||||||
|
@ -20,7 +20,7 @@ all:
|
|||||||
else \
|
else \
|
||||||
action="initialized"; \
|
action="initialized"; \
|
||||||
fi; \
|
fi; \
|
||||||
rsync -qa "$$src/" "$(BUILDDIR)/$$dst/" && \
|
rsync -qa --exclude .gitignore "$$src/" "$(BUILDDIR)/$$dst/" && \
|
||||||
mp-commit "$(BUILDDIR)/$$dst/" \
|
mp-commit "$(BUILDDIR)/$$dst/" \
|
||||||
"$$dst subprofile $$action$${neq:+ (using $$src)}"; \
|
"$$dst subprofile $$action$${neq:+ (using $$src)}"; \
|
||||||
done
|
done
|
||||||
|
Loading…
Reference in New Issue
Block a user