diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2016-12-01 00:12:38 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-07 10:38:06 +0000 |
commit | e61b6e96b05a440b9d4fab92cf53e5f74f2d5e89 (patch) | |
tree | 25ad69e1564ae3f2bf5159d25368a297d6ebf8ac | |
parent | a46cebeaf9fef23b37c77079a4b5db2eed76bb25 (diff) | |
download | poky-e61b6e96b05a440b9d4fab92cf53e5f74f2d5e89.tar.gz |
kernel.bbclass: let do_deploy depend on do_packagedata
The do_deploy runs depmodwrapper which requires
pkgdata/kernel-depmod/kernel-abiversion, which is generated by
PACKAGEFUNCS. So we need let do_deploy depend on do_packagedata.
This can fix the errors which happens sometimes when kernel upgrades:
DEBUG: Executing shell function do_deploy
Error: Kernel version 4.8.8-WR9.0.0.1_standard does not match kernel-abiversion (4.8.8-WR9.0.0.0_standard)
And we only see this error when kernel upgrades and rebuild, but doesn't
see it in a normal build, this is becuase depmodwrapper doesn't exit
error when kernel-depmod/kernel-abiversion doesn't exit, it just prints
an error which should go into log.do_deploy:
if [ ! -r /path/to/sysroots/qemux86-64/pkgdata/kernel-depmod/kernel-abiversion ]; then
echo "Unable to read: /path/to/sysroots/qemux86-64/pkgdata/kernel-depmod/kernel-abiversion" >&2
else
[foo]
fi
We can see that there is no "exit 1", I guess it was designed to let it
can run without kernel-abiversion
(From OE-Core rev: 64148a30397b8c92414262c0d414d103d2b97ddd)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/kernel.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 25a153cd20..17e85a4530 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass | |||
@@ -630,6 +630,6 @@ do_deploy[cleandirs] = "${DEPLOYDIR}" | |||
630 | do_deploy[dirs] = "${DEPLOYDIR} ${B}" | 630 | do_deploy[dirs] = "${DEPLOYDIR} ${B}" |
631 | do_deploy[prefuncs] += "package_get_auto_pr" | 631 | do_deploy[prefuncs] += "package_get_auto_pr" |
632 | 632 | ||
633 | addtask deploy after do_populate_sysroot | 633 | addtask deploy after do_populate_sysroot do_packagedata |
634 | 634 | ||
635 | EXPORT_FUNCTIONS do_deploy | 635 | EXPORT_FUNCTIONS do_deploy |