From 3ff972228b08c37adf41b760c2bbc5313b90715f Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Fri, 5 Aug 2022 16:32:48 +0200 Subject: [RCAR] Update kernel-module-vspm-if recipice name * The last update of RCAR BSP has change the recipes name of the recipes kernel-module-vspm-if. meta-agl must be updated too. Bug-AGL: SPEC-4517 Signed-off-by: Ronan Le Martret Change-Id: I02f978c2ddca7e5a2d12e25145ea1cfad1be0a25 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/27868 Reviewed-by: Jan-Simon Moeller Tested-by: Jan-Simon Moeller --- .../kernel-module-vspm-if.bbappend | 27 +++++++++++++++++++ .../kernel-module-vspmif.bbappend | 30 ---------------------- 2 files changed, 27 insertions(+), 30 deletions(-) create mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspm-if.bbappend delete mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bbappend (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 new file mode 100644 index 000000000..a0c4d94c2 --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspm-if.bbappend @@ -0,0 +1,27 @@ +KERNEL_MODULE_AUTOLOAD:append = " vspm_if" +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 + 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 +# kernel-module-vspmif package and doesn't end up packaged in +# 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" + +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 deleted file mode 100644 index a9ff3b4e1..000000000 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -KERNEL_MODULE_AUTOLOAD:append = " vspm_if" -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 - 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 -# kernel-module-vspmif package and doesn't end up packaged in -# 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