summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJeremy Puhlman <jpuhlman@mvista.com>2018-04-25 14:18:27 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-25 22:27:46 +0000
commit5e376572d4edb3d0a54c09d3b709918b53ae6452 (patch)
tree607982ce6c500c9c984ca605ea47fcd1705ea5cd /meta
parent9947f6ad5b3820ac63ff74fb2574c0256d890d7b (diff)
downloadpoky-5e376572d4edb3d0a54c09d3b709918b53ae6452.tar.gz
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) (From OE-Core rev: 8e23a3d59421f34961f39a7db512e93eb9647ec6) Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/populate_sdk_ext.bbclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index e1bba49eaf..8dfb8df52e 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -325,8 +325,9 @@ python copy_buildsystem () {
325 f.write('TCLIBCAPPEND = ""\n') 325 f.write('TCLIBCAPPEND = ""\n')
326 f.write('DL_DIR = "${TOPDIR}/downloads"\n') 326 f.write('DL_DIR = "${TOPDIR}/downloads"\n')
327 327
328 f.write('INHERIT += "%s"\n' % 'uninative') 328 if bb.data.inherits_class('uninative', d):
329 f.write('UNINATIVE_CHECKSUM[%s] = "%s"\n\n' % (d.getVar('BUILD_ARCH'), uninative_checksum)) 329 f.write('INHERIT += "%s"\n' % 'uninative')
330 f.write('UNINATIVE_CHECKSUM[%s] = "%s"\n\n' % (d.getVar('BUILD_ARCH'), uninative_checksum))
330 f.write('CONF_VERSION = "%s"\n\n' % d.getVar('CONF_VERSION', False)) 331 f.write('CONF_VERSION = "%s"\n\n' % d.getVar('CONF_VERSION', False))
331 332
332 # Some classes are not suitable for SDK, remove them from INHERIT 333 # Some classes are not suitable for SDK, remove them from INHERIT