From e86a1f1f305d532833fe6f1b321cb22795bea7c6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 27 Oct 2008 19:00:27 +0000 Subject: classes/package*.bbclass: Remove the build_package_revision function Based on experience, this function is going to cause massive code readability issues. We can actually clean up the code more without it so do this instead. --- classes/package_tar.bbclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'classes/package_tar.bbclass') diff --git a/classes/package_tar.bbclass b/classes/package_tar.bbclass index 9ce0c98b8b..e5d3f74126 100644 --- a/classes/package_tar.bbclass +++ b/classes/package_tar.bbclass @@ -5,8 +5,7 @@ IMAGE_PKGTYPE ?= "tar" python package_tar_fn () { import os from bb import data - fn = os.path.join(bb.data.getVar('DEPLOY_DIR_TAR', d), "%s-%s-%s.tar.gz" % (bb.data.getVar('PKG', d), bb.data.getVar('PV', d), build_package_revision(d))) - fn = bb.data.expand(fn, d) + fn = os.path.join(bb.data.getVar('DEPLOY_DIR_TAR', d, True), bb.data.expand('${PKG}-${PV}-${PR}${DISTRO_PR}.tar.gz', d, True)) bb.data.setVar('PKGFN', fn, d) } @@ -86,7 +85,7 @@ python do_package_tar () { 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), build_package_revision(localdata))) + bb.note("Not creating empty archive for %s" % (pkg, bb.data.expand('${PV}-${PR}${DISTRO_PR}', d, True))) continue ret = os.system("tar -czf %s %s" % (tarfn, '.')) if ret != 0: -- cgit v1.2.3