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>
This commit is contained in:
parent
87cb470304
commit
a6630c2310
|
@ -106,7 +106,7 @@ class Bzr(FetchMethod):
|
||||||
if scmdata == "keep":
|
if scmdata == "keep":
|
||||||
tar_flags = ""
|
tar_flags = ""
|
||||||
else:
|
else:
|
||||||
tar_flags = "--exclude '.bzr' --exclude '.bzrtags'"
|
tar_flags = "--exclude='.bzr' --exclude='.bzrtags'"
|
||||||
|
|
||||||
# tar them up to a defined filename
|
# 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])
|
runfetchcmd("tar %s -czf %s %s" % (tar_flags, ud.localpath, os.path.basename(ud.pkgdir)), d, cleanup = [ud.localpath])
|
||||||
|
|
|
@ -147,7 +147,7 @@ class Cvs(FetchMethod):
|
||||||
if scmdata == "keep":
|
if scmdata == "keep":
|
||||||
tar_flags = ""
|
tar_flags = ""
|
||||||
else:
|
else:
|
||||||
tar_flags = "--exclude 'CVS'"
|
tar_flags = "--exclude='CVS'"
|
||||||
|
|
||||||
# tar them up to a defined filename
|
# tar them up to a defined filename
|
||||||
if 'fullpath' in ud.parm:
|
if 'fullpath' in ud.parm:
|
||||||
|
|
|
@ -83,7 +83,7 @@ class Repo(FetchMethod):
|
||||||
if scmdata == "keep":
|
if scmdata == "keep":
|
||||||
tar_flags = ""
|
tar_flags = ""
|
||||||
else:
|
else:
|
||||||
tar_flags = "--exclude '.repo' --exclude '.git'"
|
tar_flags = "--exclude='.repo' --exclude='.git'"
|
||||||
|
|
||||||
# Create a cache
|
# Create a cache
|
||||||
runfetchcmd("tar %s -czf %s %s" % (tar_flags, ud.localpath, os.path.join(".", "*") ), d)
|
runfetchcmd("tar %s -czf %s %s" % (tar_flags, ud.localpath, os.path.join(".", "*") ), d)
|
||||||
|
|
|
@ -150,7 +150,7 @@ class Svn(FetchMethod):
|
||||||
if scmdata == "keep":
|
if scmdata == "keep":
|
||||||
tar_flags = ""
|
tar_flags = ""
|
||||||
else:
|
else:
|
||||||
tar_flags = "--exclude '.svn'"
|
tar_flags = "--exclude='.svn'"
|
||||||
|
|
||||||
os.chdir(ud.pkgdir)
|
os.chdir(ud.pkgdir)
|
||||||
# tar them up to a defined filename
|
# tar them up to a defined filename
|
||||||
|
|
Loading…
Reference in New Issue