summaryrefslogtreecommitdiffstats
path: root/meta-agl-lxc/dynamic-layers/meta-rcar-gen3
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2022-08-09 11:33:17 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2022-08-09 15:43:04 +0200
commit13169c3265ba75d783eb3723504298a08e768110 (patch)
tree9f30b921d3491ad9bc8a55d58fd3bf6f3db8800e /meta-agl-lxc/dynamic-layers/meta-rcar-gen3
parentce87122d195d3a1fea454cfa4acd91e22ccea264 (diff)
Rename Instrument Cluster Container layer
meta-agl-lxc is no longer reflecting the actual content and use of the layer. Rename it to 'meta-agl-ic-container' and the feature to 'agl-ic-container'. Also rename the main image to 'agl-cluster-demo-lxc-host' to match the pattern used by all other images e.g. agl-<ivi,cluster,telematics>-demo-* . But keep the names of the underlying images as-is. Bug-AGL: SPEC-4464 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: I898c786ca884331b302a3be8e150379fcf5bdc9b
Diffstat (limited to 'meta-agl-lxc/dynamic-layers/meta-rcar-gen3')
-rw-r--r--meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-connectivity/openssl/openssl_%.bbappend4
-rw-r--r--meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in17
-rw-r--r--meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bbappend8
-rw-r--r--meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo/mount.in22
-rw-r--r--meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo/network.in5
-rw-r--r--meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bbappend5
-rw-r--r--meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/multi-display.inc3
-rw-r--r--meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/drm-lease-manager/drm-lease-manager-init.bbappend2
-rw-r--r--meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/drm-lease-manager/drm-lease-manager-init/drm-lease-manager.ini7
-rw-r--r--meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend22
-rw-r--r--meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend1
-rw-r--r--meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend7
-rw-r--r--meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend6
-rw-r--r--meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bbappend6
-rw-r--r--meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend9
-rw-r--r--meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bbappend8
-rw-r--r--meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspm-if.bbappend6
-rw-r--r--meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.%.bbappend4
18 files changed, 0 insertions, 142 deletions
diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-connectivity/openssl/openssl_%.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-connectivity/openssl/openssl_%.bbappend
deleted file mode 100644
index 6060e6b1..00000000
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-connectivity/openssl/openssl_%.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-# Add a hook to disable depending on cryptodev-module for containers
-CRYPTODEV_RDEPENDS = "cryptodev-module"
-CRYPTODEV_RDEPENDS:aglcontainerguest = ""
-PACKAGECONFIG[cryptodev-linux] = "enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux,,${CRYPTODEV_RDEPENDS}"
diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in
deleted file mode 100644
index 523b5272..00000000
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in
+++ /dev/null
@@ -1,17 +0,0 @@
-# lxc mount setting
-lxc.mount.entry = /var/lib/lxc/cluster-demo/system.conf etc/systemd/system.conf.d/10-environment.conf none bind,optional,create=file
-
-lxc.mount.auto = cgroup:mixed proc:mixed sys:mixed
-lxc.mount.entry = shm /dev/shm tmpfs defaults 0 0
-lxc.mount.entry = /sys/kernel/security sys/kernel/security none ro,bind,optional 0 0
-
-lxc.cgroup.devices.allow = c 226:* rwm
-lxc.mount.entry = /dev/dri dev/dri none bind,optional,create=dir
-
-lxc.mount.entry = /run/drm-lease-manager/lease-cluster var/display/drm-lease-manager/lease none bind,create=file
-
-lxc.cgroup.devices.allow = c 10:* rwm
-lxc.mount.entry = /dev/pvr_sync dev/pvr_sync none bind,optional,create=file
-
-lxc.mount.entry = /run/pipewire/icipc-0 var/icipc-0 none bind,optional,create=file
-
diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bbappend
deleted file mode 100644
index 92888ba8..00000000
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-require multi-display.inc
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
-
-# If you want to change display assign in your board, please change this line in your recipe.
-DRM_LEASE_DEVICE ?= "${@bb.utils.contains("HAS_MULTI_DISPLAY", "1", "card0-HDMI-A-2", "card0-HDMI-A-1" ,d)}"
-
-LXC_AUTO_START ?= "1"
diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo/mount.in b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo/mount.in
deleted file mode 100644
index 2fbf4193..00000000
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo/mount.in
+++ /dev/null
@@ -1,22 +0,0 @@
-# lxc mount setting
-lxc.mount.entry = /var/lib/lxc/ivi-demo/system.conf etc/systemd/system.conf.d/10-environment.conf none bind,optional,create=file
-
-lxc.mount.auto = cgroup:mixed proc:mixed sys:mixed
-lxc.mount.entry = shm /dev/shm tmpfs defaults 0 0
-lxc.mount.entry = /sys/kernel/security sys/kernel/security none ro,bind,optional 0 0
-lxc.mount.entry = tmpfs run tmpfs defaults
-lxc.mount.entry = /run/udev/data run/udev/data none ro,bind,optional,create=dir
-
-lxc.cgroup.devices.allow = c 226:* rwm
-lxc.mount.entry = /dev/dri dev/dri none bind,optional,create=dir
-
-lxc.mount.entry = /run/drm-lease-manager/lease-ivi var/display/drm-lease-manager/lease none bind,create=file
-
-lxc.cgroup.devices.allow = c 13:* rwm
-lxc.mount.entry = /dev/input dev/input none bind,optional,create=dir
-
-lxc.cgroup.devices.allow = c 10:* rwm
-lxc.mount.entry = /dev/pvr_sync dev/pvr_sync none bind,optional,create=file
-
-lxc.mount.entry = /run/pipewire/pipewire-0 var/pipewire-0 none bind,optional,create=file
-
diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo/network.in b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo/network.in
deleted file mode 100644
index 6545b1ad..00000000
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo/network.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# lxc network setting
-lxc.net.0.type = veth
-lxc.net.0.link = lxcbr0
-lxc.net.0.flags = up
-lxc.net.0.hwaddr = 00:16:3e:69:87:a4
diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bbappend
deleted file mode 100644
index f58fe2cb..00000000
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-require multi-display.inc
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
-
-LXC_AUTO_START ?= "${@bb.utils.contains("HAS_MULTI_DISPLAY", "1", "1", "0" ,d)}"
diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/multi-display.inc b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/multi-display.inc
deleted file mode 100644
index 96a3e29e..00000000
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/multi-display.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-HAS_MULTI_DISPLAY ?= ""
-HAS_MULTI_DISPLAY += "${@bb.utils.contains("AGL_FEATURES", "kingfisher", "1", "" ,d)}"
-HAS_MULTI_DISPLAY += "${@bb.utils.contains("AGL_FEATURES", "agl-refhw-h3", "1", "" ,d)}"
diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/drm-lease-manager/drm-lease-manager-init.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/drm-lease-manager/drm-lease-manager-init.bbappend
deleted file mode 100644
index 371f6539..00000000
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/drm-lease-manager/drm-lease-manager-init.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI = "file://drm-lease-manager.ini"
diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/drm-lease-manager/drm-lease-manager-init/drm-lease-manager.ini b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/drm-lease-manager/drm-lease-manager-init/drm-lease-manager.ini
deleted file mode 100644
index 45ecfc27..00000000
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/drm-lease-manager/drm-lease-manager-init/drm-lease-manager.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[[lease]]
-name="lease-ivi"
-connectors=["HDMI-A-1"]
-
-[[lease]]
-name="lease-cluster"
-connectors=["HDMI-A-2"]
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
deleted file mode 100644
index 462dd5fc..00000000
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend
+++ /dev/null
@@ -1,22 +0,0 @@
-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/* \
- ${nonarch_base_libdir}/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
deleted file mode 100644
index d0a6a502..00000000
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-RDEPENDS:${PN}:append = " gles-user-module-firmware"
diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend
deleted file mode 100644
index a9d09a77..00000000
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend
+++ /dev/null
@@ -1,7 +0,0 @@
-inherit guest-kernel-module
-
-do_install:aglcontainerguest:append() {
- # Install shared header file to ${includedir}
- install -m 644 ${S}/${MMNGR_DRV_DIR}/include/mmngr_public_cmn.h ${D}/${includedir}/
- install -m 644 ${S}/${MMNGR_DRV_DIR}/include/mmngr_private_cmn.h ${D}/${includedir}/
-}
diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend
deleted file mode 100644
index 2323de93..00000000
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-inherit guest-kernel-module
-
-do_install:aglcontainerguest:append() {
- # Install shared header files to ${includedir}
- install -m 644 ${S}/${MMNGRBUF_DRV_DIR}/include/mmngr_buf_private_cmn.h ${D}/${includedir}/
-}
diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bbappend
deleted file mode 100644
index 7c221585..00000000
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-inherit guest-kernel-module
-
-do_install:aglcontainerguest:append() {
- # Install shared header file
- install -m 644 ${S}/include/uvcs_ioctl.h ${D}/${includedir}/
-}
diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend
deleted file mode 100644
index 057613fb..00000000
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-inherit guest-kernel-module
-
-do_install:aglcontainerguest:append() {
- # Install shared header file to ${includedir}
- install -m 644 ${S}/vsp2driver/linux/vsp2.h ${D}/${includedir}/
-}
-
-PACKAGES:append:aglcontainerguest = " ${PN}-dev"
-FILES:${PN}-dev:aglcontainerguest += "${includedir}"
diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bbappend
deleted file mode 100644
index eb478bea..00000000
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-inherit guest-kernel-module
-
-do_install:aglcontainerguest:append() {
- # Install shared header files
- install -m 644 ${S}/${VSPM_DRV_DIR}/include/vspm_cmn.h ${D}/${includedir}/
- install -m 644 ${S}/${VSPM_DRV_DIR}/include/vsp_drv.h ${D}/${includedir}/
- install -m 644 ${S}/${VSPM_DRV_DIR}/include/fdp_drv.h ${D}/${includedir}/
-}
diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspm-if.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspm-if.bbappend
deleted file mode 100644
index 00078b9c..00000000
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspm-if.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-inherit guest-kernel-module
-
-do_install:aglcontainerguest:append() {
- # Install shared header file
- install -m 644 ${S}/${VSPMIF_DRV_DIR}/include/vspm_if.h ${D}/${includedir}/
-}
diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.%.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.%.bbappend
deleted file mode 100644
index 204b6902..00000000
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.%.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-DEPENDS:remove:aglcontainerguest = "linux-renesas"
-
-EXTRA_OECONF:remove:aglcontainerguest = "--enable-kms"
-PACKAGECONFIG:remove:aglcontainerguest = "kms"