From a6862865f72d4becafae03b9a973b5c12f6373f2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 19 Feb 2008 12:26:02 +0000 Subject: package_rpm/tar.bbclass: Don't clobber task depends, append to it. Also make tar packaging slightly less verbose (from poky) --- classes/package_tar.bbclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'classes/package_tar.bbclass') diff --git a/classes/package_tar.bbclass b/classes/package_tar.bbclass index cb4c42b261..876cec6cfe 100644 --- a/classes/package_tar.bbclass +++ b/classes/package_tar.bbclass @@ -83,15 +83,12 @@ python do_package_tar () { bb.mkdirhier(pkgoutdir) bb.build.exec_func('package_tar_fn', localdata) tarfn = bb.data.getVar('PKGFN', localdata, 1) -# if os.path.exists(tarfn): -# del localdata -# continue os.chdir(root) from glob import glob if not glob('*'): bb.note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1))) continue - ret = os.system("tar -czvf %s %s" % (tarfn, '.')) + ret = os.system("tar -czf %s %s" % (tarfn, '.')) if ret != 0: bb.error("Creation of tar %s failed." % tarfn) } @@ -99,7 +96,10 @@ python do_package_tar () { python () { import bb if bb.data.getVar('PACKAGES', d, True) != '': - bb.data.setVarFlag('do_package_write_tar', 'depends', 'tar-native:do_populate_staging', d) + deps = (bb.data.getVarFlag('do_package_write_tar', 'depends', d) or "").split() + deps.append('tar-native:do_populate_staging') + deps.append('fakeroot-native:do_populate_staging') + bb.data.setVarFlag('do_package_write_tar', 'depends', " ".join(deps), d) } -- cgit v1.2.3