summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2010-02-03 19:13:43 +0100
committerFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2010-02-03 19:13:43 +0100
commita44e5b4cfd8b0b32386e65cbc30f816c062cc162 (patch)
treea16ef00818ad114af4c94e0525eb5485fa151340 /classes
parent70256f95a191da48f1b4eeac2abb9cfd8f82ff43 (diff)
packaged-staging.bbclass: added missing $DISTRO_PR}'s
This file was not updated when DISTRO_PR was introduced. Result of it was that packages were not properly added to the packaged staging package (due to faulty filenames being generated). This patch adds ${DISTRO_PR} to the filenames involved Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'classes')
-rw-r--r--classes/packaged-staging.bbclass9
1 files changed, 5 insertions, 4 deletions
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index 1c5c4cd531..108cfb096b 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -377,18 +377,19 @@ python do_package_stage () {
if not packaged(pkg, d):
continue
if bb.data.inherits_class('package_ipk', d):
- srcname = bb.data.expand(pkgname + "_${PV}-" + pr + "_" + arch + ".ipk", d)
+ srcname = bb.data.expand(pkgname + "_${PV}-" + pr + "${DISTRO_PR}" + "_" + arch + ".ipk", d)
srcfile = bb.data.expand("${DEPLOY_DIR_IPK}/" + arch + "/" + srcname, d)
if os.path.exists(srcfile):
destpath = ipkpath + "/" + arch + "/"
bb.mkdirhier(destpath)
+ print destpath
bb.copyfile(srcfile, destpath + srcname)
if bb.data.inherits_class('package_deb', d):
if arch == 'all':
- srcname = bb.data.expand(pkgname + "_${PV}-" + pr + "_all.deb", d)
+ srcname = bb.data.expand(pkgname + "_${PV}-" + pr + "${DISTRO_PR}" + "_all.deb", d)
else:
- srcname = bb.data.expand(pkgname + "_${PV}-" + pr + "_${DPKG_ARCH}.deb", d)
+ srcname = bb.data.expand(pkgname + "_${PV}-" + pr + "${DISTRO_PR}" + "_${DPKG_ARCH}.deb", d)
srcfile = bb.data.expand("${DEPLOY_DIR_DEB}/" + arch + "/" + srcname, d)
if os.path.exists(srcfile):
destpath = debpath + "/" + arch + "/"
@@ -399,7 +400,7 @@ python do_package_stage () {
version = bb.data.getVar('PV', d, 1)
version = version.replace('-', '+')
bb.data.setVar('RPMPV', version, d)
- srcname = bb.data.expand(pkgname + "-${RPMPV}-" + pr + ".${TARGET_ARCH}.rpm", d)
+ srcname = bb.data.expand(pkgname + "-${RPMPV}-" + pr + "${DISTRO_PR}" + ".${TARGET_ARCH}.rpm", d)
srcfile = bb.data.expand("${DEPLOY_DIR_RPM}/" + arch + "/" + srcname, d)
if os.path.exists(srcfile):
destpath = rpmpath + "/" + arch + "/"