diff options
author | Adrian Alonso <aalonso@secretlab.ca> | 2011-05-05 13:14:31 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-10 09:56:20 +0100 |
commit | 9ebafcf5e2fa123a3c8b877ea20a759b8b48ff99 (patch) | |
tree | 3ef63f2b2388d62c04c7d3d7ef898e203b893862 /meta/classes/package_rpm.bbclass | |
parent | 9f2d50ccf007706743368905ed045e58fbc95754 (diff) | |
download | poky-9ebafcf5e2fa123a3c8b877ea20a759b8b48ff99.tar.gz |
package_rpm: use target vendor information
* Instead of hardcoding target vendor string "-poky"
use TARGET_VENDOR information in case of using external
toolchains
(From OE-Core rev: 0638c470410b7ac3057d8f64ae0d389b5c3da838)
Signed-off-by: Adrian Alonso <aalonso@secretlab.ca>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
-rw-r--r-- | meta/classes/package_rpm.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 70170d19ef..1cf9f798d3 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -761,13 +761,14 @@ python do_package_rpm () { | |||
761 | # Setup the rpmbuild arguments... | 761 | # Setup the rpmbuild arguments... |
762 | rpmbuild = bb.data.getVar('RPMBUILD', d, True) | 762 | rpmbuild = bb.data.getVar('RPMBUILD', d, True) |
763 | targetsys = bb.data.getVar('TARGET_SYS', d, True) | 763 | targetsys = bb.data.getVar('TARGET_SYS', d, True) |
764 | targetvendor = bb.data.getVar('TARGET_VENDOR', d, True) | ||
764 | pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH}', d) | 765 | pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH}', d) |
765 | pkgarch = bb.data.expand('${PACKAGE_ARCH}', d) | 766 | pkgarch = bb.data.expand('${PACKAGE_ARCH}', d) |
766 | bb.mkdirhier(pkgwritedir) | 767 | bb.mkdirhier(pkgwritedir) |
767 | os.chmod(pkgwritedir, 0755) | 768 | os.chmod(pkgwritedir, 0755) |
768 | 769 | ||
769 | cmd = rpmbuild | 770 | cmd = rpmbuild |
770 | cmd = cmd + " --nodeps --short-circuit --target " + pkgarch + "-poky-linux-gnu --buildroot " + pkgd | 771 | cmd = cmd + " --nodeps --short-circuit --target " + pkgarch + targetvendor + "-linux-gnu --buildroot " + pkgd |
771 | cmd = cmd + " --define '_topdir " + workdir + "' --define '_rpmdir " + pkgwritedir + "'" | 772 | cmd = cmd + " --define '_topdir " + workdir + "' --define '_rpmdir " + pkgwritedir + "'" |
772 | cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'" | 773 | cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'" |
773 | cmd = cmd + " --define '_use_internal_dependency_generator 0'" | 774 | cmd = cmd + " --define '_use_internal_dependency_generator 0'" |