From 26114b6718fa45b38ae921b58981d4aa2510b571 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Tue, 14 Jun 2022 12:15:29 +0200 Subject: [RCAR] Fix video stream for user "agl-driver" * Remove RPROVIDES:${PN} "kernel-module-vspm-if" in kernel-module-vspmif recipes. kernel-module-vspmif should not provide "kernel-module-vspm-if". "kernel-module-vspm-if" is a separate package with module rules. * Add udev rules for /dev files: uvcs_drv, vspm_if, mmngr, mmngrbuf Bug-AGL: SPEC-4436 Signed-off-by: Ronan Le Martret Change-Id: I44a0665d6576cdcc9dbbfe5401de3dc9bc281473 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/27635 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-uvcs/kernel-module-uvcs-drv.bbappend | 10 ++++++++++ .../kernel-module-vspmif/kernel-module-vspmif.bbappend | 13 +++++++++++++ 2 files changed, 23 insertions(+) (limited to 'meta-agl-bsp/meta-rcar-gen3/recipes-kernel') 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 a0ffc20ce..c900bf2f0 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 @@ -9,4 +9,14 @@ do_install:append() { mv ${D}/lib/modules ${D}${nonarch_base_libdir}/ rm -rf ${D}/lib fi + + # Add a rule to ensure the 'display' user has permission to access + install -d ${D}${sysconfdir}/udev/rules.d + cat >${D}${sysconfdir}/udev/rules.d/56-uvcs.rules <<'EOF' +KERNEL=="uvcs", MODE="0660", GROUP="display" +EOF } + +FILES:${PN}:append = " \ + ${sysconfdir}/udev/rules.d/*.rules \ +" diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bbappend index 214b67c0b..4cc572d29 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bbappend @@ -8,6 +8,12 @@ do_install:append() { mv ${D}/lib/modules ${D}${nonarch_base_libdir}/ rm -rf ${D}/lib fi + + # Add a rule to ensure the 'display' user has permission to access + install -d ${D}${sysconfdir}/udev/rules.d + cat >${D}${sysconfdir}/udev/rules.d/56-vspm_if.rules <<'EOF' +KERNEL=="vspm_if", MODE="0660", GROUP="display" +EOF } # Required to guarantee the module goes into the expected @@ -15,3 +21,10 @@ do_install:append() { # kernel-module-vspm-if by the default behavior. Can be removed if # upstream correctly use ${nonarch_base_libdir} themselves. FILES:${PN} += "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/vspm_if.ko" + +#kernel-module-vspmif should not provide "kernel-module-vspm-if". "kernel-module-vspm-if" is a separate package with module rules. +RPROVIDES:${PN}:remove += "kernel-module-vspm-if" + +FILES:${PN}:append = " \ + ${sysconfdir}/udev/rules.d/*.rules \ +" -- cgit 1.2.3-korg