[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1788/8267] bitbake: fetch: Fix use of tar's --exclude option for tar >= 1.29
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 1788/8267] bitbake: fetch: Fix use of tar's --exclude option for tar >= 1.29
- Date: Sat, 16 Dec 2017 22:19:05 +0000 (UTC)
commit a6630c231033cdc4ad783404d7969937ed7a9bd1
Author: Mariano Lopez <mariano lopez linux intel com>
Date: Fri Aug 5 13:54:44 2016 +0000
bitbake: fetch: Fix use of tar's --exclude option for tar >= 1.29
Starting from tar 1.29 the --exclude option won't work
anymore if is not used before the path. There are some
fetch modules that copy the ptest using tar and --exclude
option. This fixes these for bitbake.
[YOCTO #9763]
(Bitbake rev: cc71d5d9da71ea5f21d02f3b2fbf119bd2d794f0)
Signed-off-by: Mariano Lopez <mariano lopez linux intel com>
Signed-off-by: Ross Burton <ross burton intel com>
Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
bitbake/lib/bb/fetch2/bzr.py | 2 +-
bitbake/lib/bb/fetch2/cvs.py | 2 +-
bitbake/lib/bb/fetch2/repo.py | 2 +-
bitbake/lib/bb/fetch2/svn.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/bitbake/lib/bb/fetch2/bzr.py b/bitbake/lib/bb/fetch2/bzr.py
index 03e9ac4..ce11ee7 100644
--- a/bitbake/lib/bb/fetch2/bzr.py
+++ b/bitbake/lib/bb/fetch2/bzr.py
@@ -106,7 +106,7 @@ class Bzr(FetchMethod):
if scmdata == "keep":
tar_flags = ""
else:
- tar_flags = "--exclude '.bzr' --exclude '.bzrtags'"
+ tar_flags = "--exclude='.bzr' --exclude='.bzrtags'"
# tar them up to a defined filename
runfetchcmd("tar %s -czf %s %s" % (tar_flags, ud.localpath, os.path.basename(ud.pkgdir)), d, cleanup
= [ud.localpath])
diff --git a/bitbake/lib/bb/fetch2/cvs.py b/bitbake/lib/bb/fetch2/cvs.py
index d27d96f..43a234f 100644
--- a/bitbake/lib/bb/fetch2/cvs.py
+++ b/bitbake/lib/bb/fetch2/cvs.py
@@ -147,7 +147,7 @@ class Cvs(FetchMethod):
if scmdata == "keep":
tar_flags = ""
else:
- tar_flags = "--exclude 'CVS'"
+ tar_flags = "--exclude='CVS'"
# tar them up to a defined filename
if 'fullpath' in ud.parm:
diff --git a/bitbake/lib/bb/fetch2/repo.py b/bitbake/lib/bb/fetch2/repo.py
index 21678eb..fd64b7e 100644
--- a/bitbake/lib/bb/fetch2/repo.py
+++ b/bitbake/lib/bb/fetch2/repo.py
@@ -83,7 +83,7 @@ class Repo(FetchMethod):
if scmdata == "keep":
tar_flags = ""
else:
- tar_flags = "--exclude '.repo' --exclude '.git'"
+ tar_flags = "--exclude='.repo' --exclude='.git'"
# Create a cache
runfetchcmd("tar %s -czf %s %s" % (tar_flags, ud.localpath, os.path.join(".", "*") ), d)
diff --git a/bitbake/lib/bb/fetch2/svn.py b/bitbake/lib/bb/fetch2/svn.py
index 8a29193..968ca79 100644
--- a/bitbake/lib/bb/fetch2/svn.py
+++ b/bitbake/lib/bb/fetch2/svn.py
@@ -150,7 +150,7 @@ class Svn(FetchMethod):
if scmdata == "keep":
tar_flags = ""
else:
- tar_flags = "--exclude '.svn'"
+ tar_flags = "--exclude='.svn'"
os.chdir(ud.pkgdir)
# tar them up to a defined filename
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]