meta-agl-bsp: Fix rcar3 kernel module bbappends for linux-dummy

The usrmerge fixes added to the various rcar3 kernel bbappends turn
out to cause issues when using linux-dummy as the kernel as the
IC EG system containers do, add the required extra checking to avoid
issues.

Bug-AGL: SPEC-4703

Change-Id: I7749c9f921791a7c143a7003827939af64997a5c
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/28472
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

1 files changed, 5 insertions, 3 deletions

diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend
index d190595a7..879d0e174 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend
@@ -4,8 +4,10 @@ KERNEL_MODULE_PACKAGE_SUFFIX = ""
 do_install:append() {
     # Work around upstream not using ${nonarch_base_libdir}/modules
     if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
-        install -d ${D}${nonarch_base_libdir}/
-        mv ${D}/lib/modules ${D}${nonarch_base_libdir}/
-        rm -rf ${D}/lib
+        if [ -d ${D}/lib/modules ]; then
+            install -d ${D}${nonarch_base_libdir}/
+            mv ${D}/lib/modules ${D}${nonarch_base_libdir}/
+            rm -rf ${D}/lib
+        fi
     fi
 }