summaryrefslogtreecommitdiffstats
path: root/meta
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 13:51:47 +0100
commit03679b7e66d59f7c0d6b46abcdec1503cfa0154c (patch)
tree1a5d989a0d0fb733807b65af7d1074f43ad9725b /meta
parent97294829cde141c8b6b50418de27f53507f5764e (diff)
downloadpoky-03679b7e66d59f7c0d6b46abcdec1503cfa0154c.tar.gz
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. (From OE-Core rev: 0d3f7a753f17fa8c455f64e3df3259ef1887fd8a) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 () {
654 targetsys = d.getVar('TARGET_SYS', True) 654 targetsys = d.getVar('TARGET_SYS', True)
655 targetvendor = d.getVar('TARGET_VENDOR', True) 655 targetvendor = d.getVar('TARGET_VENDOR', True)
656 package_arch = (d.getVar('PACKAGE_ARCH', True) or "").replace("-", "_") 656 package_arch = (d.getVar('PACKAGE_ARCH', True) or "").replace("-", "_")
657 if package_arch not in "all any noarch".split() and not package_arch.endswith("_nativesdk"): 657 sdkpkgsuffix = (d.getVar('SDKPKGSUFFIX', True) or "nativesdk").replace("-", "_")
658 if package_arch not in "all any noarch".split() and not package_arch.endswith(sdkpkgsuffix):
658 ml_prefix = (d.getVar('MLPREFIX', True) or "").replace("-", "_") 659 ml_prefix = (d.getVar('MLPREFIX', True) or "").replace("-", "_")
659 d.setVar('PACKAGE_ARCH_EXTEND', ml_prefix + package_arch) 660 d.setVar('PACKAGE_ARCH_EXTEND', ml_prefix + package_arch)
660 else: 661 else: