summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanomi Manchego <danomimanchego123@gmail.com>2013-06-07 21:43:42 -0400
committerPeter Korsgaard <peter@korsgaard.com>2014-02-04 17:23:04 +0100
commit2f865405c9215071a3031f2a2b89db9ec686342d (patch)
tree013cdb6a02a93f62dcacd1712c450b2b852cf541
parent3f2d43e3ed631d803fb7b9eadbdb18a5b79d5b63 (diff)
downloadbuildroot-2f865405c9215071a3031f2a2b89db9ec686342d.tar.gz
buildroot-2f865405c9215071a3031f2a2b89db9ec686342d.zip
Makefile: change rsync used in overlays to always transfer files
If two files with the same relative paths exist in multiple overlay skeletons, and they have the same modification time and size, then rsync might not copy the later file on top of the earlier file. This patch fixes this by adding the -I option to the rsync commands used in the overlay skeleton file installations. ("man rsync" indicates that this option turns off the file-size/mod-date "quick check" behavior, causing all files to be updated - more like the cp commands that we had originally.) [Peter: use --ignore-times to make it obvious what the option does] Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 4a675d443a..9775397748 100644
--- a/Makefile
+++ b/Makefile
@@ -472,7 +472,7 @@ RSYNC_VCS_EXCLUSIONS = \
$(BUILD_DIR)/.root:
mkdir -p $(TARGET_DIR)
- rsync -a $(RSYNC_VCS_EXCLUSIONS) \
+ rsync -a --ignore-times $(RSYNC_VCS_EXCLUSIONS) \
--chmod=Du+w --exclude .empty --exclude '*~' \
$(TARGET_SKELETON)/ $(TARGET_DIR)/
$(INSTALL) -m 0644 support/misc/target-dir-warning.txt $(TARGET_DIR_WARNING_FILE)
OpenPOWER on IntegriCloud