diff options
Diffstat (limited to 'meta-agl-bsp/meta-rcar-gen3/recipes-kernel')
7 files changed, 79 insertions, 0 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 b8882ae49..6b9768394 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 @@ -4,3 +4,18 @@ module_do_compile:prepend() { cd ${S}/build/linux/config/compilers cp aarch64-linux-gnu.mk ${TARGET_SYS}.mk } + +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 +} + +# Required to guarantee the module goes into the expected +# kernel-module-gles package and doesn't end up packaged in +# kernel-module-pvrsvkm by the default behavior. Can be removed +# if upstream correctly use ${nonarch_base_libdir} themselves. +FILES:${PN} += "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/pvrsrvkm.ko" 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 98b8e92c3..6e4b9a024 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 @@ -1,2 +1,11 @@ KERNEL_MODULE_AUTOLOAD:append = " mmngr" 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 +} 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 fbff56fff..d190595a7 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 @@ -1,2 +1,11 @@ KERNEL_MODULE_AUTOLOAD:append = " mmngrbuf" 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 +} 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 1fa00a859..a0ffc20ce 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 @@ -1,3 +1,12 @@ require checksum_control.inc 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 + fi +} 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 new file mode 100644 index 000000000..f6a756d04 --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend @@ -0,0 +1,14 @@ +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 +} + +# Required to guarantee the module goes into the expected +# kernel-module-vsp2driver package and doesn't end up packaged in +# kernel-module-vsp2 by the default behavior. Can be removed if +# upstream correctly use ${nonarch_base_libdir} themselves. +FILES:${PN} += "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/vsp2.ko" 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 new file mode 100644 index 000000000..aebf44cc4 --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bbappend @@ -0,0 +1,8 @@ +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 +} 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 5efe01045..214b67c0b 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 @@ -1,2 +1,17 @@ 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 +} + +# 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" |