aboutsummaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp
diff options
context:
space:
mode:
Diffstat (limited to 'meta-agl-bsp')
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend18
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend15
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend9
-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.bbappend19
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend14
-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.bbappend24
8 files changed, 0 insertions, 115 deletions
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend
index e191617af..8f2d47adc 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend
@@ -1,21 +1,3 @@
require checksum_control.inc
RDEPENDS:${PN}:append = " wayland-wsegl"
-
-do_install:append(){
- sed -i 's/GROUP="video"/GROUP="display"/g' ${D}${sysconfdir}/udev/rules.d/72-pvr-seat.rules
-
- # Work around upstream not using ${nonarch_base_libdir}/firmware
- if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
- install -d ${D}${nonarch_base_libdir}/
- mv ${D}/lib/firmware ${D}${nonarch_base_libdir}/
- rm -rf ${D}/lib
- fi
-
- # Undo upstream's out of date use of weston@.service
- if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)} ; then
- # Fix weston dependency, needs to be weston.service
- sed -i 's/^RequiredBy=weston@.service$/RequiredBy=weston.service/' \
- ${D}${systemd_system_unitdir}/rc.pvr.service
- fi
-}
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..b8882ae49 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,18 +4,3 @@ 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 6e4b9a024..98b8e92c3 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,11 +1,2 @@
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 d190595a7..603a8f74b 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,11 +1,3 @@
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 c900bf2f0..1fa00a859 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,22 +1,3 @@
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
-
- # 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-vsp2driver/kernel-module-vsp2driver.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend
deleted file mode 100644
index f6a756d04..000000000
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend
+++ /dev/null
@@ -1,14 +0,0 @@
-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
deleted file mode 100644
index aebf44cc4..000000000
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-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-vspm-if.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspm-if.bbappend
index a0c4d94c2..226fa11ac 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
@@ -1,27 +1,3 @@
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 \
-"