From: Danomi Manchego Date: Sat, 8 Jun 2013 01:43:42 +0000 (-0400) Subject: Makefile: change rsync used in overlays to always transfer files X-Git-Tag: 2014.02-rc1~92 X-Git-Url: http://rtime.felk.cvut.cz/gitweb/coffee/buildroot.git/commitdiff_plain/2f865405c9215071a3031f2a2b89db9ec686342d 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 Signed-off-by: Peter Korsgaard --- 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)