summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorMariano Lopez <mariano.lopez@linux.intel.com>2016-08-05 13:54:44 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-10 10:46:34 +0100
commita6630c231033cdc4ad783404d7969937ed7a9bd1 (patch)
tree3e720c85a0007fcaa10e3deeee92c1e34f8241a2 /bitbake
parent87cb470304dce720a1723f81b327dc06332fd147 (diff)
downloadpoky-a6630c231033cdc4ad783404d7969937ed7a9bd1.tar.gz
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>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/fetch2/bzr.py2
-rw-r--r--bitbake/lib/bb/fetch2/cvs.py2
-rw-r--r--bitbake/lib/bb/fetch2/repo.py2
-rw-r--r--bitbake/lib/bb/fetch2/svn.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/fetch2/bzr.py b/bitbake/lib/bb/fetch2/bzr.py
index 03e9ac461b..ce11ee7c20 100644
--- a/bitbake/lib/bb/fetch2/bzr.py
+++ b/bitbake/lib/bb/fetch2/bzr.py
@@ -106,7 +106,7 @@ class Bzr(FetchMethod):
106 if scmdata == "keep": 106 if scmdata == "keep":
107 tar_flags = "" 107 tar_flags = ""
108 else: 108 else:
109 tar_flags = "--exclude '.bzr' --exclude '.bzrtags'" 109 tar_flags = "--exclude='.bzr' --exclude='.bzrtags'"
110 110
111 # tar them up to a defined filename 111 # tar them up to a defined filename
112 runfetchcmd("tar %s -czf %s %s" % (tar_flags, ud.localpath, os.path.basename(ud.pkgdir)), d, cleanup = [ud.localpath]) 112 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 d27d96f68c..43a234f590 100644
--- a/bitbake/lib/bb/fetch2/cvs.py
+++ b/bitbake/lib/bb/fetch2/cvs.py
@@ -147,7 +147,7 @@ class Cvs(FetchMethod):
147 if scmdata == "keep": 147 if scmdata == "keep":
148 tar_flags = "" 148 tar_flags = ""
149 else: 149 else:
150 tar_flags = "--exclude 'CVS'" 150 tar_flags = "--exclude='CVS'"
151 151
152 # tar them up to a defined filename 152 # tar them up to a defined filename
153 if 'fullpath' in ud.parm: 153 if 'fullpath' in ud.parm:
diff --git a/bitbake/lib/bb/fetch2/repo.py b/bitbake/lib/bb/fetch2/repo.py
index 21678eb7d9..fd64b7e626 100644
--- a/bitbake/lib/bb/fetch2/repo.py
+++ b/bitbake/lib/bb/fetch2/repo.py
@@ -83,7 +83,7 @@ class Repo(FetchMethod):
83 if scmdata == "keep": 83 if scmdata == "keep":
84 tar_flags = "" 84 tar_flags = ""
85 else: 85 else:
86 tar_flags = "--exclude '.repo' --exclude '.git'" 86 tar_flags = "--exclude='.repo' --exclude='.git'"
87 87
88 # Create a cache 88 # Create a cache
89 runfetchcmd("tar %s -czf %s %s" % (tar_flags, ud.localpath, os.path.join(".", "*") ), d) 89 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 8a291935c1..968ca79b30 100644
--- a/bitbake/lib/bb/fetch2/svn.py
+++ b/bitbake/lib/bb/fetch2/svn.py
@@ -150,7 +150,7 @@ class Svn(FetchMethod):
150 if scmdata == "keep": 150 if scmdata == "keep":
151 tar_flags = "" 151 tar_flags = ""
152 else: 152 else:
153 tar_flags = "--exclude '.svn'" 153 tar_flags = "--exclude='.svn'"
154 154
155 os.chdir(ud.pkgdir) 155 os.chdir(ud.pkgdir)
156 # tar them up to a defined filename 156 # tar them up to a defined filename