public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
From: "Paul Eggleton" <paul.eggleton@linux.microsoft.com>
To: openembedded-core@lists.openembedded.org
Subject: [RFC PATCH 2/2] classes/buildhistory: also save recipe info for native recipes
Date: Sun, 18 Oct 2020 21:03:57 -0700	[thread overview]
Message-ID: <91068e23807dd135ee2bd5b57d87edd9338e89f5.1603080016.git.paul.eggleton@linux.microsoft.com> (raw)
In-Reply-To: <cover.1603080016.git.paul.eggleton@linux.microsoft.com>

From: Paul Eggleton <paul.eggleton@microsoft.com>

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 <paul.eggleton@microsoft.com>
---
 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 7d5e3eb..6d04d8c 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
 
-- 
1.8.3.1


  parent reply	other threads:[~2020-10-19  4:04 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-19  4:03 [RFC PATCH 0/2] buildhistory: record SRC_URI Paul Eggleton
2020-10-19  4:03 ` [RFC PATCH 1/2] classes/buildhistory: " Paul Eggleton
2020-10-26  6:43   ` [OE-core] " Mikko Rapeli
2020-10-28 14:21     ` Richard Purdie
2020-10-29  9:18       ` Mikko Rapeli
2020-10-29 11:35         ` Richard Purdie
2020-10-19  4:03 ` Paul Eggleton [this message]
2020-10-19 21:16 ` [OE-core] [RFC PATCH 0/2] buildhistory: " Paul Eggleton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=91068e23807dd135ee2bd5b57d87edd9338e89f5.1603080016.git.paul.eggleton@linux.microsoft.com \
    --to=paul.eggleton@linux.microsoft.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox