diff options
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | package/pkg-generic.mk | 2 |
2 files changed, 9 insertions, 7 deletions
@@ -426,11 +426,14 @@ ifeq ($(BR2_ROOTFS_SKELETON_CUSTOM),y) TARGET_SKELETON=$(BR2_ROOTFS_SKELETON_CUSTOM_PATH) endif +RSYNC_VCS_EXCLUSIONS = \ + --exclude .svn --exclude .git --exclude .hg --exclude .bzr \ + --exclude CVS + $(BUILD_DIR)/.root: mkdir -p $(TARGET_DIR) - rsync -a \ - --exclude .empty --exclude .svn --exclude .git \ - --exclude .hg --exclude=CVS --exclude '*~' \ + rsync -a $(RSYNC_VCS_EXCLUSIONS) \ + --exclude .empty --exclude '*~' \ $(TARGET_SKELETON)/ $(TARGET_DIR)/ cp support/misc/target-dir-warning.txt $(TARGET_DIR_WARNING_FILE) @ln -snf lib $(TARGET_DIR)/$(LIB_SYMLINK) @@ -504,9 +507,8 @@ endif @$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \ $(call MESSAGE,"Copying overlay $(d)"); \ - rsync -a \ - --exclude .empty --exclude .svn --exclude .git \ - --exclude .hg --exclude=CVS --exclude '*~' \ + rsync -a $(RSYNC_VCS_EXCLUSIONS) \ + --exclude .empty --exclude '*~' \ $(d)/ $(TARGET_DIR)$(sep)) @$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \ diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index f1835a1aa9..80b38a5808 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -68,7 +68,7 @@ $(BUILD_DIR)/%/.stamp_extracted: $(BUILD_DIR)/%/.stamp_rsynced: @$(call MESSAGE,"Syncing from source dir $(SRCDIR)") @test -d $(SRCDIR) || (echo "ERROR: $(SRCDIR) does not exist" ; exit 1) - rsync -au --cvs-exclude --include core $(SRCDIR)/ $(@D) + rsync -au $(RSYNC_VCS_EXCLUSIONS) $(SRCDIR)/ $(@D) $(foreach hook,$($(PKG)_POST_RSYNC_HOOKS),$(call $(hook))$(sep)) $(Q)touch $@ |
