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]

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>

diff --git a/lib/bb/fetch2/bzr.py b/lib/bb/fetch2/bzr.py
index 03e9ac461ba393942927801f6e9ff9e371aabd9b..ce11ee7c20abd3bb97e3a85e805b75e13d7a9aaf 100644 (file)
--- a/lib/bb/fetch2/bzr.py
+++ b/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/lib/bb/fetch2/cvs.py b/lib/bb/fetch2/cvs.py
index d27d96f68c359e19ce1717dd5a08b00befe64a71..43a234f5903f6418651e6779c5e579109ccecbf9 100644 (file)
--- a/lib/bb/fetch2/cvs.py
+++ b/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/lib/bb/fetch2/repo.py b/lib/bb/fetch2/repo.py
index 21678eb7d9be505de7c2ad93fbaaebb8e0d64222..fd64b7e626e9bd1981332bd27c0f934fdca1c70e 100644 (file)
--- a/lib/bb/fetch2/repo.py
+++ b/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/lib/bb/fetch2/svn.py b/lib/bb/fetch2/svn.py
index 8a291935c1237024763d6aa9f87f41a09074cbe3..968ca79b300ed9d77bde52ef0102a46ba69149d9 100644 (file)
--- a/lib/bb/fetch2/svn.py
+++ b/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