From 66d13479c4e75b4e7e04ff639384c2574441112c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 2 Oct 2008 15:21:36 +0000 Subject: classes: Split rpm feeds by PACKAGE_ARCH git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5381 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/classes/package_rpm.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta') 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 -- cgit v1.2.3