Openembedded Core Discussions
 help / color / mirror / Atom feed
From: "Mark Hatle" <mark.hatle@kernel.crashing.org>
To: openembedded-core@lists.openembedded.org
Subject: [master][PATCH v7 2/3] kernel.bbclass: Move away from calling package_get_auto_pr
Date: Thu, 27 Aug 2020 17:12:36 -0500	[thread overview]
Message-ID: <20200827221237.143692-3-mark.hatle@kernel.crashing.org> (raw)
In-Reply-To: <20200827221237.143692-1-mark.hatle@kernel.crashing.org>

...instead we call read_subpackage_metadata.

Calling package_get_auto_pr *should* result in the same PKGV AUTOINC
replacement.  However, it will also end up changing PKGR differently
then do_package as the BB_TASKHASH used will be for the wrong task.

Generally this won't cause any real-world issue, but it could cause
problems.

Moving to read_subpackage_metadata ensures that the values used
in do_package will be read in and used for kernel deployment.

Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
---
 meta/classes/kernel.bbclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 7869184b94..14c22da306 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -748,7 +748,10 @@ kernel_do_deploy() {
 		done
 	fi
 }
-do_deploy[prefuncs] += "package_get_auto_pr"
+
+# We deploy to filenames that include PKGV and PKGR, read the saved data to
+# ensure we get the right values for both
+do_deploy[prefuncs] += "read_subpackage_metadata"
 
 addtask deploy after do_populate_sysroot do_packagedata
 
-- 
2.17.1


  parent reply	other threads:[~2020-08-27 22:12 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-27 22:12 [master][PATCH v7 0/3] Allow PR Service and hash equiv together Mark Hatle
2020-08-27 22:12 ` [master][PATCH v7 1/3] buildhistory.bbclass: Rework to use read_subpackage_metadata Mark Hatle
2020-08-27 22:12 ` Mark Hatle [this message]
2020-08-27 22:12 ` [master][PATCH v7 3/3] package.bbclass: hash equivalency and pr service Mark Hatle
2020-08-28  6:05   ` [OE-core] " Richard Purdie
2020-09-01 20:44     ` Mark Hatle
     [not found]     ` <1630C3BD464433A0.30204@lists.openembedded.org>
2020-09-01 23:24       ` Mark Hatle

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=20200827221237.143692-3-mark.hatle@kernel.crashing.org \
    --to=mark.hatle@kernel.crashing.org \
    --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