]> code.ossystems Code Review - openembedded-core.git/commitdiff
classes/package_rpm.bbclass: Fix SDK Suffix reference
authorMark Hatle <mark.hatle@windriver.com>
Wed, 25 Jun 2014 00:28:04 +0000 (19:28 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 25 Jun 2014 10:49:39 +0000 (11:49 +0100)
The meta-mingw layer attempts to change the SDK Suffix, but the rpm
packaging had a hard coded reference to _nativesdk.

I did a quick scan for other hard coded entries and did not fine any
more.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/package_rpm.bbclass

index 1ff2b3643415ae740221d58b2c045744e60738e4..71cfdc1da461fcc3e102bda99dd239e69e9a0904 100644 (file)
@@ -654,7 +654,8 @@ python do_package_rpm () {
     targetsys = d.getVar('TARGET_SYS', True)
     targetvendor = d.getVar('TARGET_VENDOR', True)
     package_arch = (d.getVar('PACKAGE_ARCH', True) or "").replace("-", "_")
-    if package_arch not in "all any noarch".split() and not package_arch.endswith("_nativesdk"):
+    sdkpkgsuffix = (d.getVar('SDKPKGSUFFIX', True) or "nativesdk").replace("-", "_")
+    if package_arch not in "all any noarch".split() and not package_arch.endswith(sdkpkgsuffix):
         ml_prefix = (d.getVar('MLPREFIX', True) or "").replace("-", "_")
         d.setVar('PACKAGE_ARCH_EXTEND', ml_prefix + package_arch)
     else: