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:06:44 +0100 |
| commit | 86142dad13935a0d9af4a4177e05ff5c39003db7 (patch) | |
| tree | 738034736e2992f5122b14ec1cc1147b230871ad /meta/classes/kernel.bbclass | |
| parent | 155ae6a3fe84c25904ffe7058e125bb4a28e2b45 (diff) | |
| download | openembedded-core-contrib-86142dad13935a0d9af4a4177e05ff5c39003db7.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.
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() { 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 |