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() {
                 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