Patchwork <pkg>-rsync: Reincluding core files and folders, which got kicked out by --cvs-exclude option.

login
register
mail settings
Submitter Andreas Naumann
Date March 22, 2013, 3:56 p.m.
Message ID <514C7F46.8070806@andin.de>
Download mbox | patch
Permalink /patch/230105/
State Accepted
Headers show

Comments

Andreas Naumann - March 22, 2013, 3:56 p.m.
The --cvs-exclude option also excludes 'core', which when rsyncing e.g. 
a linux tree is less than optimal..


Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Tested-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
  package/pkg-generic.mk | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

  # Handle the SOURCE_CHECK and SHOW_EXTERNAL_DEPS cases for rsynced
Peter Korsgaard - March 24, 2013, 9:05 p.m.
>>>>> "Andreas" == Andreas Naumann <dev@andin.de> writes:

 Andreas> The --cvs-exclude option also excludes 'core', which when rsyncing
 Andreas> e.g. a linux tree is less than optimal..

Committed, thanks.
Peter Korsgaard - March 24, 2013, 9:09 p.m.
>>>>> "Andreas" == Andreas Naumann <dev@andin.de> writes:

 Andreas> The --cvs-exclude option also excludes 'core', which when rsyncing
 Andreas> e.g. a linux tree is less than optimal..

Could you please use 'git send-email' in the future? Your Thunderbird
has corrupted the patch pretty badly (tabs->spaces, word wrapping, ..)

I've fixed it up manually this time.

Patch

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 8d964a1..595ad1b 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -62,7 +62,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 $(SRCDIR)/ $(@D)
+       rsync -au --cvs-exclude --include core $(SRCDIR)/ $(@D)
         $(Q)touch $@