From: Ovidiu Panait Date: Mon, 5 Dec 2022 14:56:49 +0000 (+0200) Subject: kernel.bbclass: remove empty module directories to prevent QA issues X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~2343 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7120b09a33af4c9a18063c0f2e51fb598697e39c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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. Signed-off-by: Ovidiu Panait Signed-off-by: Alexandre Belloni --- diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass index 3f6b40907f4..553e17bb4ea 100644 --- a/meta/classes-recipe/kernel.bbclass +++ b/meta/classes-recipe/kernel.bbclass @@ -450,8 +450,8 @@ kernel_do_install() { oe_runmake DEPMOD=echo MODLIB=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION} INSTALL_FW_PATH=${D}${nonarch_base_libdir}/firmware modules_install rm "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build" rm "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source" - # If the kernel/ directory is empty remove it to prevent QA issues - rmdir --ignore-fail-on-non-empty "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel" + # Remove empty module directories to prevent QA issues + find "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel" -type d -empty -delete else bbnote "no modules to install" fi