diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-10-02 15:21:36 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-10-02 15:21:36 +0000 |
| commit | 66d13479c4e75b4e7e04ff639384c2574441112c (patch) | |
| tree | 4057733120c034e51e74ecb016b8bfb13a958661 /meta/classes | |
| parent | 9c63c7ef051fe82c43bf2819da8fe2caa83e1c77 (diff) | |
| download | poky-66d13479c4e75b4e7e04ff639384c2574441112c.tar.gz | |
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/classes')
| -rw-r--r-- | meta/classes/package_rpm.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index aa22dd7668..ae87bbff03 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
| @@ -125,7 +125,7 @@ python write_specfile() { | |||
| 125 | 125 | ||
| 126 | # move the rpm into the pkgoutdir | 126 | # move the rpm into the pkgoutdir |
| 127 | rpm = bb.data.expand('${RPMBUILDPATH}/RPMS/${TARGET_ARCH}/${PKG}-${RPMPV}-${PR}.${TARGET_ARCH}.rpm', d) | 127 | rpm = bb.data.expand('${RPMBUILDPATH}/RPMS/${TARGET_ARCH}/${PKG}-${RPMPV}-${PR}.${TARGET_ARCH}.rpm', d) |
| 128 | outrpm = bb.data.expand('${DEPLOY_DIR_RPM}/${PKG}-${RPMPV}-${PR}.${TARGET_ARCH}.rpm', d) | 128 | outrpm = bb.data.expand('${DEPLOY_DIR_RPM}/${PACKAGE_ARCH}/${PKG}-${RPMPV}-${PR}.${TARGET_ARCH}.rpm', d) |
| 129 | bb.movefile(rpm, outrpm) | 129 | bb.movefile(rpm, outrpm) |
| 130 | } | 130 | } |
| 131 | 131 | ||
| @@ -187,7 +187,7 @@ python do_package_rpm () { | |||
| 187 | 187 | ||
| 188 | bb.data.update_data(localdata) | 188 | bb.data.update_data(localdata) |
| 189 | basedir = os.path.join(os.path.dirname(root)) | 189 | basedir = os.path.join(os.path.dirname(root)) |
| 190 | pkgoutdir = outdir | 190 | pkgoutdir = os.path.join(outdir, bb.data.getVar('PACKAGE_ARCH', localdata, 1)) |
| 191 | bb.mkdirhier(pkgoutdir) | 191 | bb.mkdirhier(pkgoutdir) |
| 192 | bb.data.setVar('OUTSPECFILE', os.path.join(workdir, "%s.spec" % pkg), localdata) | 192 | bb.data.setVar('OUTSPECFILE', os.path.join(workdir, "%s.spec" % pkg), localdata) |
| 193 | # Save the value of RPMBUILD expanded into the new dictonary so any | 193 | # Save the value of RPMBUILD expanded into the new dictonary so any |