[oe-commits] Ahsan, Noor : packaged-staging.bbclass: bug fix in ipk file name generation for searching ipk file.

[git version control]

Module: openembedded.git
Branch: shr/testing2011.1
Commit: b1b71c9452bc77f72cd7d31af928cb0ad2675b84
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=b1b71c9452bc77f72cd7d31af928cb0ad2675b84

Author: Ahsan, Noor <noor_ahsan at mentor.com>
Date:   Mon Jan 10 12:13:57 2011 +0000

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

---

 classes/packaged-staging.bbclass |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index d3b095c..13b96dd 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 + "/"