Skip to contentSkip to conversation

Makefile: make skeleton rsync options consistent

PATCH New Danomi Manchego 2 participants 4 messages May 2, 2013 – Sep 8, 2013 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Makefile: make skeleton rsync options consistent

Initially, a "cp" was used for the one-time target skeleton installation, and an "rsync" was used for the every-time overlay skeleton installations. Then, the target skeleton install was changed to also use rsync (1cd3f992fb3659aacbb0cdd3ed64347a37569891). Now there are two rsyncs, but with different filter specs, which seems odd.

This patch adds --excludes to both invocations of rsync to make them consistent, and removes the -u option from the initial target skeleton installation.

---
 Makefile |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
Makefile +4 -2
index 97804ff..5b690f0 100644
@@ -429,7 +429,9 @@ endif
 
 $(BUILD_DIR)/.root:
 	mkdir -p $(TARGET_DIR)
-	rsync -au --exclude=.empty --exclude=CVS --exclude=.svn --exclude='*~' \
+	rsync -a \
+		--exclude .empty --exclude .svn --exclude .git \
+		--exclude .hg --exclude=CVS --exclude '*~' \
 		$(TARGET_SKELETON)/ $(TARGET_DIR)/
 	cp support/misc/target-dir-warning.txt $(TARGET_DIR_WARNING_FILE)
 	touch $@
@@ -505,7 +507,7 @@ endif
 		$(call MESSAGE,"Copying overlay $(d)"); \
 		rsync -a \
 			--exclude .empty --exclude .svn --exclude .git \
-			--exclude .hg --exclude '*~' \
+			--exclude .hg --exclude=CVS --exclude '*~' \
 			$(d)/ $(TARGET_DIR)$(sep))
 
 	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 Makefile: make skeleton rsync options consistent

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Danomi" == Danomi Manchego <[email protected]> writes:

Danomi> Initially, a "cp" was used for the one-time target skeleton Danomi> installation, and an "rsync" was used for the every-time overlay Danomi> skeleton installations. Then, the target skeleton install was Danomi> changed to also use rsync (1cd3f992fb3659aacbb0cdd3ed64347a37569891). Danomi> Now there are two rsyncs, but with different filter specs, which Danomi> seems odd.

Danomi> This patch adds --excludes to both invocations of rsync to make them Danomi> consistent, and removes the -u option from the initial target skeleton Danomi> installation.

Danomi> Signed-off-by: Danomi Manchego <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 Makefile: make skeleton rsync options consistent

In reply to Danomi Manchego

Ping?

The patch still applies, with no fuzz but some shifted lines. The problem described
still exists, and is still fixed by the patch.

Danomi -

Quoted 42 lines · Danomi Manchego

Initially, a "cp" was used for the one-time target skeleton installation, and an "rsync" was used for the every-time overlay skeleton installations. Then, the target skeleton install was changed to also use rsync (1cd3f992fb3659aacbb0cdd3ed64347a37569891). Now there are two rsyncs, but with different filter specs, which seems odd.

This patch adds --excludes to both invocations of rsync to make them consistent, and removes the -u option from the initial target skeleton installation.

---
 Makefile |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
Makefile +4 -4
index 97804ff..5b690f0 100644
@@ -429,7 +429,9 @@ endif
 
 $(BUILD_DIR)/.root:
        mkdir -p $(TARGET_DIR)
-       rsync -au --exclude=.empty --exclude=CVS --exclude=.svn
--exclude='*~' \
+       rsync -a \
+               --exclude .empty --exclude .svn --exclude .git \
+               --exclude .hg --exclude=CVS --exclude '*~' \
                $(TARGET_SKELETON)/ $(TARGET_DIR)/
        cp support/misc/target-dir-warning.txt $(TARGET_DIR_WARNING_FILE)
        touch $@
@@ -505,7 +507,7 @@ endif
                $(call MESSAGE,"Copying overlay $(d)"); \
                rsync -a \
                        --exclude .empty --exclude .svn --exclude .git \
-                       --exclude .hg --exclude '*~' \
+                       --exclude .hg --exclude=CVS --exclude '*~' \
                        $(d)/ $(TARGET_DIR)$(sep))
 
        @$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \
--
Quoted 3 lines

1.7.9.5

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20130908/cbe8659b/attachment.html>

#3 lore raw

PATCH 1/1 Makefile: make skeleton rsync options consistent

On Sun, Sep 8, 2013 at 1:36 PM, Danomi Manchego <[email protected]

Quoted 7 lines

wrote:

Ping?

The patch still applies, with no fuzz but some shifted lines. The problem described still exists, and is still fixed by the patch.

Arg, apologies, apologies apologies - I pinged on the wrong rsync patch.
I meant the patch at http://patchwork.ozlabs.org/patch/249912/ -
"Makefile: change rsync used in overlays to always transfer files".

Danomi -
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20130908/a8850696/attachment.html>