]> code.ossystems Code Review - openembedded-core.git/commitdiff
package_rpm: use target vendor information
authorAdrian Alonso <aalonso@secretlab.ca>
Thu, 5 May 2011 18:14:31 +0000 (13:14 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 10 May 2011 08:51:41 +0000 (09:51 +0100)
* Instead of hardcoding target vendor string "-poky"
  use TARGET_VENDOR information in case of using external
  toolchains

Signed-off-by: Adrian Alonso <aalonso@secretlab.ca>
meta/classes/package_rpm.bbclass

index 70170d19ef3feca7951182579da635c944f2e402..1cf9f798d3e6dc1fe2d2f4a408158e0571812431 100644 (file)
@@ -761,13 +761,14 @@ python do_package_rpm () {
        # Setup the rpmbuild arguments...
        rpmbuild = bb.data.getVar('RPMBUILD', d, True)
        targetsys = bb.data.getVar('TARGET_SYS', d, True)
+       targetvendor = bb.data.getVar('TARGET_VENDOR', d, True)
        pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH}', d)
        pkgarch = bb.data.expand('${PACKAGE_ARCH}', d)
        bb.mkdirhier(pkgwritedir)
        os.chmod(pkgwritedir, 0755)
 
        cmd = rpmbuild
-       cmd = cmd + " --nodeps --short-circuit --target " + pkgarch + "-poky-linux-gnu --buildroot " + pkgd
+       cmd = cmd + " --nodeps --short-circuit --target " + pkgarch + targetvendor + "-linux-gnu --buildroot " + pkgd
        cmd = cmd + " --define '_topdir " + workdir + "' --define '_rpmdir " + pkgwritedir + "'"
        cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'"
        cmd = cmd + " --define '_use_internal_dependency_generator 0'"