classes/package_tar: fix conflicts with package_deb / package_ipk
Avoid tar noticing that the directory is changing when do_package_write_deb or do_package_write_ipk are running at the same time as do_package_write_tar (because DEBIAN and CONTROL are being added and removed while tar is running so the directory changes). Fixes [YOCTO #5652] (From OE-Core rev: d000761acdb2645ac879d8d9d6b022770545f644) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
d7eb0f5731
commit
ae12658095
|
@ -41,11 +41,12 @@ python do_package_tar () {
|
|||
basedir = os.path.dirname(root)
|
||||
tarfn = localdata.expand("${DEPLOY_DIR_TAR}/${PKG}-${PKGV}-${PKGR}.tar.gz")
|
||||
os.chdir(root)
|
||||
from glob import glob
|
||||
if not glob('*'):
|
||||
dlist = os.listdir(root)
|
||||
if not dlist:
|
||||
bb.note("Not creating empty archive for %s-%s-%s" % (pkg, localdata.getVar('PKGV', True), localdata.getVar('PKGR', True)))
|
||||
continue
|
||||
ret = subprocess.call("tar -czf %s %s" % (tarfn, '.'), shell=True)
|
||||
args = "tar -cz --exclude=CONTROL --exclude=DEBIAN -f".split()
|
||||
ret = subprocess.call(args + [tarfn] + dlist)
|
||||
if ret != 0:
|
||||
bb.error("Creation of tar %s failed." % tarfn)
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue