summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2023-02-13 18:30:25 -0500
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2023-02-15 21:06:14 +0000
commitca3d27f7fc5c7f0adfeec6ad3b822ff39fb2cee5 (patch)
treefcf607f5f342d1a7f60ff877d0fc5ba8dd09cfc6
parentaed4fc1f0e2b7958eb8b32d909a8fe3fc3714144 (diff)
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>
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend8
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend8
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend8
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bbappend8
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend8
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bbappend8
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspm-if.bbappend8
7 files changed, 35 insertions, 21 deletions
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend
index 6b9768394..a4363bf88 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend
@@ -8,9 +8,11 @@ module_do_compile:prepend() {
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
}
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend
index 6e4b9a024..1d602cd16 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.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
}
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
}
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bbappend
index c900bf2f0..46977e329 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bbappend
@@ -5,9 +5,11 @@ KERNEL_MODULE_AUTOLOAD = "uvcs_drv"
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
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend
index f6a756d04..6ff42fe46 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend
@@ -1,9 +1,11 @@
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
}
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bbappend
index aebf44cc4..b42ef08ec 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bbappend
@@ -1,8 +1,10 @@
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
}
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