diff options
| author | Danomi Manchego <danomimanchego123@gmail.com> | 2013-05-01 17:15:26 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-05-02 23:33:08 +0200 |
| commit | e97376a0fc018970f7a166f183d3817a6b1bfaf1 (patch) | |
| tree | bf697379a3a74d70af546d103e67d545cfe809af /Makefile | |
| parent | e74edc6d9c38dc8685bee84d9bd70b64e1231b50 (diff) | |
| download | buildroot-novena-e97376a0fc018970f7a166f183d3817a6b1bfaf1.tar.gz buildroot-novena-e97376a0fc018970f7a166f183d3817a6b1bfaf1.zip | |
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.
Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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)), \ |