diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-02-24 16:05:45 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-24 16:18:57 +0000 |
| commit | d000761acdb2645ac879d8d9d6b022770545f644 (patch) | |
| tree | 840259a60d491e71e52cfd961c3fb0660886e3e9 | |
| parent | 4708859e5627488251dc4250d45cb5f4e9736b8a (diff) | |
| download | openembedded-core-d000761acdb2645ac879d8d9d6b022770545f644.tar.gz | |
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]
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/package_tar.bbclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/package_tar.bbclass b/meta/classes/package_tar.bbclass index 2d6fc8fe21..fed2c28b69 100644 --- a/meta/classes/package_tar.bbclass +++ b/meta/classes/package_tar.bbclass @@ -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) } |