[oe] [PATCH 52/70] classes: Split rpm feeds by PACKAGE_ARCH (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard at openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5381 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/package_rpm.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index eb39834..32e5f82 100644
--- a/classes/package_rpm.bbclass
+++ b/classes/package_rpm.bbclass
@@ -129,7 +129,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)
 }
 
@@ -191,7 +191,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 
-- 
1.6.1.3