summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2014-06-24 19:28:04 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-25 11:49:39 +0100
commit0d3f7a753f17fa8c455f64e3df3259ef1887fd8a (patch)
treedbb34419f7d5d7c2340ebffa8eba644a23f1dec4
parent6a8144390eb2dee6e1baf7be75cffcacbb247002 (diff)
downloadopenembedded-core-contrib-0d3f7a753f17fa8c455f64e3df3259ef1887fd8a.tar.gz
openembedded-core-contrib-0d3f7a753f17fa8c455f64e3df3259ef1887fd8a.tar.bz2
openembedded-core-contrib-0d3f7a753f17fa8c455f64e3df3259ef1887fd8a.zip
classes/package_rpm.bbclass: Fix SDK Suffix reference
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>
-rw-r--r--meta/classes/package_rpm.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 1ff2b36434..71cfdc1da4 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -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: