1 files changed, 2 insertions, 0 deletions

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index f2a5ec5de7..51626b03f8 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -188,6 +188,8 @@ kernel_do_install() {
                 oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
                 rm "${D}/lib/modules/${KERNEL_VERSION}/build"
                 rm "${D}/lib/modules/${KERNEL_VERSION}/source"
+                # If the kernel/ directory is empty remove it to prevent QA issues
+                rmdir --ignore-fail-on-non-empty "${D}/lib/modules/${KERNEL_VERSION}/kernel"
         else
                 bbnote "no modules to install"
         fi