From: Ahsan, Noor <noor_ahsan@mentor.com>
Date: Mon, 10 Jan 2011 12:13:57 +0000 (+0000)
Subject: packaged-staging.bbclass: bug fix in ipk file name generation for searching ipk file.
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c10ac3289ceea8bf22b41c57487885a983a1c369;p=openembedded.git

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 <noor_ahsan@mentor.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---

diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index 4eb7a9167d..83e77c9eca 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -454,10 +454,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 + "/"