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_rpm.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes/package_rpm.bbclass') diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass index e10ad90ffc..f0055a1e63 100644 --- a/classes/package_rpm.bbclass +++ b/classes/package_rpm.bbclass @@ -40,7 +40,7 @@ python write_specfile() { pass if not files: from bb import note - note("Not creating empty archive for %s-%s-%s" % (bb.data.getVar('PKG',d, 1), bb.data.getVar('PV', d, 1), build_package_revision(d))) + note("Not creating empty archive for %s" % (bb.data.expand('${PKG}-${PV}-${PR}${DISTRO_PR}', d, True)) return # output .spec using this metadata store @@ -57,7 +57,7 @@ python write_specfile() { if out_vartranslate[var][0] == "%": continue fd.write("%s\t: %s\n" % (out_vartranslate[var], bb.data.getVar(var, d))) - fd.write("Release\t: %s\n" % build_package_revision(d)) + fd.write("Release\t: %s\n" % bb.data.expand('${PR}${DISTRO_PR}', d, True) fd.write("Summary\t: .\n") for var in out_vartranslate.keys(): -- cgit 1.2.3-korg