summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-10-02 15:21:36 +0000
committerRichard Purdie <richard@openedhand.com>2008-10-02 15:21:36 +0000
commit66d13479c4e75b4e7e04ff639384c2574441112c (patch)
tree4057733120c034e51e74ecb016b8bfb13a958661 /meta
parent9c63c7ef051fe82c43bf2819da8fe2caa83e1c77 (diff)
downloadopenembedded-core-66d13479c4e75b4e7e04ff639384c2574441112c.tar.gz
openembedded-core-66d13479c4e75b4e7e04ff639384c2574441112c.tar.bz2
openembedded-core-66d13479c4e75b4e7e04ff639384c2574441112c.tar.xz
openembedded-core-66d13479c4e75b4e7e04ff639384c2574441112c.zip
classes: Split rpm feeds by PACKAGE_ARCH
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5381 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package_rpm.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index aa22dd766..ae87bbff0 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -125,7 +125,7 @@ python write_specfile() {
# move the rpm into the pkgoutdir
rpm = bb.data.expand('${RPMBUILDPATH}/RPMS/${TARGET_ARCH}/${PKG}-${RPMPV}-${PR}.${TARGET_ARCH}.rpm', d)
- outrpm = bb.data.expand('${DEPLOY_DIR_RPM}/${PKG}-${RPMPV}-${PR}.${TARGET_ARCH}.rpm', d)
+ outrpm = bb.data.expand('${DEPLOY_DIR_RPM}/${PACKAGE_ARCH}/${PKG}-${RPMPV}-${PR}.${TARGET_ARCH}.rpm', d)
bb.movefile(rpm, outrpm)
}
@@ -187,7 +187,7 @@ python do_package_rpm () {
bb.data.update_data(localdata)
basedir = os.path.join(os.path.dirname(root))
- pkgoutdir = outdir
+ pkgoutdir = os.path.join(outdir, bb.data.getVar('PACKAGE_ARCH', localdata, 1))
bb.mkdirhier(pkgoutdir)
bb.data.setVar('OUTSPECFILE', os.path.join(workdir, "%s.spec" % pkg), localdata)
# Save the value of RPMBUILD expanded into the new dictonary so any