From d123606c4bef85c2436b40f51e47b602b7600c0b Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sun, 18 Oct 2020 21:03:57 -0700 Subject: classes/buildhistory: also save recipe info for native recipes If we want to also collect SRC_URI for native recipes we need to ensure that the code that writes out all of the recipe info is called - there isn't a do_packagedata for native recipes so we need to piggyback on do_populate_sysroot instead. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/classes/buildhistory.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 7d5e3eb8fd..6d04d8cfb9 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -90,8 +90,7 @@ buildhistory_emit_sysroot() { python buildhistory_emit_pkghistory() { if d.getVar('BB_CURRENTTASK') in ['populate_sysroot', 'populate_sysroot_setscene']: bb.build.exec_func("buildhistory_emit_sysroot", d) - - if not d.getVar('BB_CURRENTTASK') in ['packagedata', 'packagedata_setscene']: + elif not d.getVar('BB_CURRENTTASK') in ['packagedata', 'packagedata_setscene']: return 0 if not "package" in (d.getVar('BUILDHISTORY_FEATURES') or "").split(): @@ -229,8 +228,9 @@ python buildhistory_emit_pkghistory() { break except IOError as e: if e.errno == errno.ENOENT: - # Probably a -cross recipe, just ignore - return 0 + if not bb.data.inherits_class('native', d): + # Probably a -cross recipe, just ignore + return 0 else: raise -- cgit 1.2.3-korg