aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAhsan, Noor <noor_ahsan@mentor.com>2011-01-10 12:13:57 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2011-04-22 19:41:15 +0200
commitb1b71c9452bc77f72cd7d31af928cb0ad2675b84 (patch)
tree1b051238736e969e09a5b74d5c485489c6e49521
parentf3fc3b0f47b41c2ab33f6cc7f378e5cb2535f37f (diff)
downloadopenembedded-b1b71c9452bc77f72cd7d31af928cb0ad2675b84.zip
openembedded-b1b71c9452bc77f72cd7d31af928cb0ad2675b84.tar.gz
openembedded-b1b71c9452bc77f72cd7d31af928cb0ad2675b84.tar.bz2
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> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--classes/packaged-staging.bbclass5
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 + "/"