[oe-commits] [openembedded-core] 39/49: Only add uninative and checksum if inherited uninative class

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch sumo
in repository openembedded-core.

commit 8e23a3d59421f34961f39a7db512e93eb9647ec6
Author: Jeremy Puhlman <jpuhlman at mvista.com>
AuthorDate: Wed Apr 25 14:18:27 2018 -0700

    Only add uninative and checksum if inherited uninative class
    
    The checksum value is only calculated if the uninative class is
    inherited, so check for inherit before adding it to local.conf
    
    (From OE-Core rev: 3b5b832589d943700b273e3a4d83561be0c47f36)
    
    Signed-off-by: Jeremy Puhlman <jpuhlman at mvista.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/classes/populate_sdk_ext.bbclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index e1bba49..8dfb8df 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -325,8 +325,9 @@ python copy_buildsystem () {
             f.write('TCLIBCAPPEND = ""\n')
             f.write('DL_DIR = "${TOPDIR}/downloads"\n')
 
-            f.write('INHERIT += "%s"\n' % 'uninative')
-            f.write('UNINATIVE_CHECKSUM[%s] = "%s"\n\n' % (d.getVar('BUILD_ARCH'), uninative_checksum))
+            if bb.data.inherits_class('uninative', d):
+               f.write('INHERIT += "%s"\n' % 'uninative')
+               f.write('UNINATIVE_CHECKSUM[%s] = "%s"\n\n' % (d.getVar('BUILD_ARCH'), uninative_checksum))
             f.write('CONF_VERSION = "%s"\n\n' % d.getVar('CONF_VERSION', False))
 
             # Some classes are not suitable for SDK, remove them from INHERIT

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.