From 3c223389705c7a11e75a31430a3babeea90d1336 Mon Sep 17 00:00:00 2001 From: Naoto Yamaguchi Date: Fri, 1 Oct 2021 00:38:30 +0900 Subject: Divide firmware from gles-user-module The powervr firmware is including in gles-user-module in R-Car Gen3. Typical container integration, gles-user-module only to installing in guest, powervr kernel module only to installing in host. In this case, powerver firemware is only to installing in guest, but it is required by powervr kernel module. This patch divide powervr firmware from gles-user-module, creating new package gles-user-module-firmware. In addition, this patch add runtime dependency of that firmware package to powervr kernel module. Bug-AGL: SPEC-4130 Signed-off-by: Naoto Yamaguchi Change-Id: Ie8751bd618d076c9617870c367dacb3a9fdf1e7b --- .../gles-module/gles-user-module.bbappend | 21 +++++++++++++++++++++ .../kernel-module-gles/kernel-module-gles.bbappend | 1 + 2 files changed, 22 insertions(+) create mode 100644 meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend index c942f687..f853a22b 100644 --- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend +++ b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend @@ -1 +1,22 @@ RDEPENDS:${PN}:remove:aglcontainerguest = "kernel-module-gles" + +PACKAGES:prepend = "\ + ${PN}-firmware \ +" + +FILES:${PN} = " \ + ${libdir}/* \ + ${sysconfdir}/* \ + ${RENESAS_DATADIR}/bin/dlcsrv_REL \ +" +SYSTEMD_SERVICE:${PN} = "" + +FILES:${PN}-firmware = " \ + ${systemd_system_unitdir}/* \ + ${sysconfdir}/udev/* \ + /lib/firmware/* \ + ${exec_prefix}/bin/pvrinit \ +" +SYSTEMD_SERVICE:${PN}-firmware = "rc.pvr.service" +SYSTEMD_PACKAGES = "${PN}-firmware" +SYSTEMD_AUTO_ENABLE = "enable" diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend new file mode 100644 index 00000000..d0a6a502 --- /dev/null +++ b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend @@ -0,0 +1 @@ +RDEPENDS:${PN}:append = " gles-user-module-firmware" -- cgit 1.2.3-korg