From ca3d27f7fc5c7f0adfeec6ad3b822ff39fb2cee5 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 13 Feb 2023 18:30:25 -0500 Subject: 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 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 --- .../kernel-module-vspmif/kernel-module-vspm-if.bbappend | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif') diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspm-if.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspm-if.bbappend index a0c4d94c2..d3b27d155 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspm-if.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspm-if.bbappend @@ -4,9 +4,11 @@ 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 # Add a rule to ensure the 'display' user has permission to access -- cgit 1.2.3-korg