From b1b71c9452bc77f72cd7d31af928cb0ad2675b84 Mon Sep 17 00:00:00 2001 From: "Ahsan, Noor" Date: Mon, 10 Jan 2011 12:13:57 +0000 Subject: packaged-staging.bbclass: bug fix in ipk file name generation for searching ipk file. * First check the availability of PKGV_pkg variable, if it is not available then get value from PKGV variable for creating ipk file name for searching ipk file. Signed-off-by: Ahsan Noor Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- classes/packaged-staging.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index d3b095ceda..13b96ddfd7 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -462,10 +462,13 @@ python do_package_stage () { pr = bb.data.getVar('PR_%s' % pkg, d, 1) if not pr: pr = bb.data.getVar('PR', d, 1) + pkgv = bb.data.getVar('PKGV_%s' % pkg, d, 1) + if not pkgv: + pkgv = bb.data.getVar('PKGV', d, 1) if not oe.packagedata.packaged(pkg, d): continue if bb.data.inherits_class('package_ipk', d): - srcname = bb.data.expand(pkgname + "_${PKGV}-" + pr + "${DISTRO_PR}" + "_" + arch + ".ipk", d) + srcname = bb.data.expand(pkgname + "_" + pkgv + "-" + pr + "${DISTRO_PR}" + "_" + arch + ".ipk", d) srcfile = bb.data.expand("${DEPLOY_DIR_IPK}/" + arch + "/" + srcname, d) if os.path.exists(srcfile): destpath = ipkpath + "/" + arch + "/" -- cgit 1.2.3-korg