diff options
author | Ovidiu Panait <ovidiu.panait@windriver.com> | 2022-12-05 16:56:49 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-06 17:33:23 +0000 |
commit | 24cdd5bb636b9557cf4ae5be712096ca998ceda6 (patch) | |
tree | 14e8034c08fe8197f40aa64489b2bab95cfcabe9 /meta | |
parent | 3902078452990d6c48827388f7583877dd8d4be7 (diff) | |
download | poky-24cdd5bb636b9557cf4ae5be712096ca998ceda6.tar.gz |
kernel.bbclass: remove empty module directories to prevent QA issues
Currently, allyesconfig test runs for x86_64 fail with:
ERROR: linux-yocto-5.19.17+gitAUTOINC+0cba9aa404_aaf4490d18-r0 do_package:
QA Issue: linux-yocto: Files/directories were installed but not shipped in any
package:
/lib/modules/5.19.17/kernel/drivers/nvdimm
With CONFIG_NVDIMM_TEST_BUILD=m, an empty nvdimm directory is created during
modules_install, which triggers the QA issue.
Extend kernel_do_install() to also remove inner empty directories that might
get created by modules_install.
(From OE-Core rev: 2f2abcb6d2394cdfd3985499ed882f43a5d2a299)
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 7120b09a33af4c9a18063c0f2e51fb598697e39c)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/kernel.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 3e7264fb98..54b006550d 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass | |||
@@ -444,8 +444,8 @@ kernel_do_install() { | |||
444 | oe_runmake DEPMOD=echo MODLIB=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION} INSTALL_FW_PATH=${D}${nonarch_base_libdir}/firmware modules_install | 444 | oe_runmake DEPMOD=echo MODLIB=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION} INSTALL_FW_PATH=${D}${nonarch_base_libdir}/firmware modules_install |
445 | rm "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build" | 445 | rm "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build" |
446 | rm "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source" | 446 | rm "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source" |
447 | # If the kernel/ directory is empty remove it to prevent QA issues | 447 | # Remove empty module directories to prevent QA issues |
448 | rmdir --ignore-fail-on-non-empty "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel" | 448 | find "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel" -type d -empty -delete |
449 | else | 449 | else |
450 | bbnote "no modules to install" | 450 | bbnote "no modules to install" |
451 | fi | 451 | fi |