diff options
author | Mark Hatle <mark.hatle@kernel.crashing.org> | 2020-08-27 14:07:05 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-28 07:08:37 +0100 |
commit | fc807c9de7288fa62edf85409b3d2f55f862ac08 (patch) | |
tree | 134ffcd12c2801f1c3f8ed35da7a66495cc13916 /meta/classes/kernel.bbclass | |
parent | 5cde141ef1e037aa540963f8356c0c556b47964d (diff) | |
download | poky-fc807c9de7288fa62edf85409b3d2f55f862ac08.tar.gz |
kernel.bbclass: Move away from calling package_get_auto_pr
...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.
(From OE-Core rev: 86142dad13935a0d9af4a4177e05ff5c39003db7)
Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/kernel.bbclass')
-rw-r--r-- | meta/classes/kernel.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
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() { | |||
748 | done | 748 | done |
749 | fi | 749 | fi |
750 | } | 750 | } |
751 | do_deploy[prefuncs] += "package_get_auto_pr" | 751 | |
752 | # We deploy to filenames that include PKGV and PKGR, read the saved data to | ||
753 | # ensure we get the right values for both | ||
754 | do_deploy[prefuncs] += "read_subpackage_metadata" | ||
752 | 755 | ||
753 | addtask deploy after do_populate_sysroot do_packagedata | 756 | addtask deploy after do_populate_sysroot do_packagedata |
754 | 757 | ||