From 162e271a469e22707701fd96bd0e6a5c1f72519d Mon Sep 17 00:00:00 2001 From: Naoto Yamaguchi Date: Sun, 1 Sep 2024 10:08:47 +0900 Subject: Raspberrypi 5 support for IC container This patch add board support for raspberrypi5. Bug-AGL: SPEC-5242 Change-Id: I9e9c244da74fd2c5d83f71b43eb40ae491276096 Signed-off-by: Naoto Yamaguchi --- .../conf/include/drm-lease-multi-display.inc | 1 + .../raspberrypi4/agl-flutter-ivi-demo.json | 173 -------------------- .../rpi/agl-flutter-ivi-demo.json | 173 ++++++++++++++++++++ .../raspberrypi4/agl-momi-ivi-demo.json | 174 --------------------- .../rpi/agl-momi-ivi-demo.json | 174 +++++++++++++++++++++ .../raspberrypi4/agl-qt-ivi-demo.json | 174 --------------------- .../rpi/agl-qt-ivi-demo.json | 174 +++++++++++++++++++++ .../raspberrypi4/cluster-demo.json | 102 ------------ .../cm-config-cluster-demo/rpi/cluster-demo.json | 102 ++++++++++++ .../raspberrypi4/drm-lease-manager.ini | 7 - .../rpi/drm-lease-manager.ini | 7 + .../images/guest-image-cluster-demo.bb | 2 +- .../images/guest-image-drm-lease-test-cluster.bb | 2 +- .../images/guest-image-drm-lease-test-ivi.bb | 2 +- .../images/guest-image-ivi-demo.bb | 2 +- 15 files changed, 635 insertions(+), 634 deletions(-) delete mode 100644 meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/raspberrypi4/agl-flutter-ivi-demo.json create mode 100644 meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/rpi/agl-flutter-ivi-demo.json delete mode 100644 meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/raspberrypi4/agl-momi-ivi-demo.json create mode 100644 meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/rpi/agl-momi-ivi-demo.json delete mode 100644 meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/raspberrypi4/agl-qt-ivi-demo.json create mode 100644 meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/rpi/agl-qt-ivi-demo.json delete mode 100644 meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/raspberrypi4/cluster-demo.json create mode 100644 meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/rpi/cluster-demo.json delete mode 100644 meta-agl-ic-container/recipes-graphics/drm-lease-manager/drm-lease-manager-init/raspberrypi4/drm-lease-manager.ini create mode 100644 meta-agl-ic-container/recipes-graphics/drm-lease-manager/drm-lease-manager-init/rpi/drm-lease-manager.ini diff --git a/meta-agl-ic-container/conf/include/drm-lease-multi-display.inc b/meta-agl-ic-container/conf/include/drm-lease-multi-display.inc index bcf2e730..398958f5 100644 --- a/meta-agl-ic-container/conf/include/drm-lease-multi-display.inc +++ b/meta-agl-ic-container/conf/include/drm-lease-multi-display.inc @@ -2,4 +2,5 @@ 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)}" HAS_MULTI_DISPLAY += "${@bb.utils.contains("MACHINE", "raspberrypi4-64", "1", "" ,d)}" +HAS_MULTI_DISPLAY += "${@bb.utils.contains("MACHINE", "raspberrypi5", "1", "" ,d)}" HAS_MULTI_DISPLAY += "${@bb.utils.contains("MACHINE", "salvator-x", "1", "" ,d)}" diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/raspberrypi4/agl-flutter-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/raspberrypi4/agl-flutter-ivi-demo.json deleted file mode 100644 index 54c03a8b..00000000 --- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/raspberrypi4/agl-flutter-ivi-demo.json +++ /dev/null @@ -1,173 +0,0 @@ -{ - "name": "agl-flutter-ivi-demo", - "role": "ivi", - "base": { - "autoboot": false, - "bootpriority": 10, - "rootfs": { - "path": "/opt/container/guests/agl-flutter-ivi-demo/rootfs", - "filesystem": "ext4", - "mode": "rw", - "blockdev": [ - "/dev/mmcblk0p7", - "/dev/mmcblk0p7" - ] - }, - "lifecycle": { - "halt": "SIGRTMIN+3", - "reboot": "SIGTERM" - }, - "cap": { - "drop": "sys_module mac_admin mac_override", - "keep": "" - }, - "environment": [ - "PIPEWIRE_RUNTIME_DIR=/var", - "HOME=/home/root" - ] - }, - "fs": { - "mount": [ - { - "type": "filesystem", - "from": "tmpfs", - "to": "run", - "fstype": "tmpfs", - "option": "defaults 0 0" - }, - { - "type": "directory", - "from": "/sys/kernel/security", - "to": "sys/kernel/security", - "fstype": "none", - "option": "ro,bind,optional 0 0" - }, - { - "type": "directory", - "from": "/run/udev/data", - "to": "run/udev/data", - "fstype": "none", - "option": "ro,bind,optional,create=dir" - }, - { - "type": "directory", - "from": "/run/drm-lease-manager/lease-ivi", - "to": "var/display/drm-lease-manager/lease", - "fstype": "none", - "option": "bind,create=file" - }, - { - "type": "directory", - "from": "/run/pipewire/pipewire-0", - "to": "var/pipewire-0", - "fstype": "none", - "option": "bind,optional,create=file" - }, - { - "type": "directory", - "from": "/run/dlt", - "to": "run/dlt", - "fstype": "none", - "option": "bind,optional,create=dir" - }, - { - "type": "directory", - "from": "/opt/container/guests/agl-flutter-ivi-demo/system.conf", - "to": "etc/systemd/system.conf.d/10-environment.conf", - "fstype": "none", - "option": "bind,optional,create=file" - } - ] - }, - "device": { - "static": [ - { - "type": "devdir", - "from": "/dev/dri", - "to": "dev/dri", - "devnode": "/dev/dri/card0", - "optional": 0, - "wideallow": 1, - "exclusive": 0 - }, - { - "type": "devdir", - "from": "/dev/input", - "to": "dev/input", - "devnode": "/dev/input/event0", - "optional": 1, - "wideallow": 1, - "exclusive": 0 - } - ], - "dynamic": [ - { - "devpath": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/", - "items": [ - { - "subsystem": "usb", - "rule": { - "devtype": ["usb_device","usb_interface"], - "action": ["add", "remove"] - }, - "behavior": { - "injection": 1, - "devnode": 0, - "allow": 0, - "permission": "rw" - } - }, - { - "subsystem": "block", - "rule": { - "action": ["add", "remove","change"], - "extra" : [ - { - "checker": "exclude-fs", - "value": "ext4" - } - ] - }, - "behavior": { - "injection": 1, - "devnode": 0, - "allow": 1, - "permission": "rwm" - } - } - ] - }, - { - "devpath": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/", - "items": [ - { - "subsystem": "hid", - "rule": { - "action": ["add", "remove"] - }, - "behavior": { - "injection": 1, - "devnode": 1, - "allow": 1, - "permission": "rw" - } - } - ] - } - ] - }, - "network": { - "static": [ - { - "type": "veth", - "param": { - "name": "veth0", - "link": "lxcbr0", - "flags": "up", - "hwaddr": "00:16:3e:xx:xx:xx", - "mode": "bridge" - } - } - ] - } -} diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/rpi/agl-flutter-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/rpi/agl-flutter-ivi-demo.json new file mode 100644 index 00000000..54c03a8b --- /dev/null +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/rpi/agl-flutter-ivi-demo.json @@ -0,0 +1,173 @@ +{ + "name": "agl-flutter-ivi-demo", + "role": "ivi", + "base": { + "autoboot": false, + "bootpriority": 10, + "rootfs": { + "path": "/opt/container/guests/agl-flutter-ivi-demo/rootfs", + "filesystem": "ext4", + "mode": "rw", + "blockdev": [ + "/dev/mmcblk0p7", + "/dev/mmcblk0p7" + ] + }, + "lifecycle": { + "halt": "SIGRTMIN+3", + "reboot": "SIGTERM" + }, + "cap": { + "drop": "sys_module mac_admin mac_override", + "keep": "" + }, + "environment": [ + "PIPEWIRE_RUNTIME_DIR=/var", + "HOME=/home/root" + ] + }, + "fs": { + "mount": [ + { + "type": "filesystem", + "from": "tmpfs", + "to": "run", + "fstype": "tmpfs", + "option": "defaults 0 0" + }, + { + "type": "directory", + "from": "/sys/kernel/security", + "to": "sys/kernel/security", + "fstype": "none", + "option": "ro,bind,optional 0 0" + }, + { + "type": "directory", + "from": "/run/udev/data", + "to": "run/udev/data", + "fstype": "none", + "option": "ro,bind,optional,create=dir" + }, + { + "type": "directory", + "from": "/run/drm-lease-manager/lease-ivi", + "to": "var/display/drm-lease-manager/lease", + "fstype": "none", + "option": "bind,create=file" + }, + { + "type": "directory", + "from": "/run/pipewire/pipewire-0", + "to": "var/pipewire-0", + "fstype": "none", + "option": "bind,optional,create=file" + }, + { + "type": "directory", + "from": "/run/dlt", + "to": "run/dlt", + "fstype": "none", + "option": "bind,optional,create=dir" + }, + { + "type": "directory", + "from": "/opt/container/guests/agl-flutter-ivi-demo/system.conf", + "to": "etc/systemd/system.conf.d/10-environment.conf", + "fstype": "none", + "option": "bind,optional,create=file" + } + ] + }, + "device": { + "static": [ + { + "type": "devdir", + "from": "/dev/dri", + "to": "dev/dri", + "devnode": "/dev/dri/card0", + "optional": 0, + "wideallow": 1, + "exclusive": 0 + }, + { + "type": "devdir", + "from": "/dev/input", + "to": "dev/input", + "devnode": "/dev/input/event0", + "optional": 1, + "wideallow": 1, + "exclusive": 0 + } + ], + "dynamic": [ + { + "devpath": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/", + "items": [ + { + "subsystem": "usb", + "rule": { + "devtype": ["usb_device","usb_interface"], + "action": ["add", "remove"] + }, + "behavior": { + "injection": 1, + "devnode": 0, + "allow": 0, + "permission": "rw" + } + }, + { + "subsystem": "block", + "rule": { + "action": ["add", "remove","change"], + "extra" : [ + { + "checker": "exclude-fs", + "value": "ext4" + } + ] + }, + "behavior": { + "injection": 1, + "devnode": 0, + "allow": 1, + "permission": "rwm" + } + } + ] + }, + { + "devpath": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/", + "items": [ + { + "subsystem": "hid", + "rule": { + "action": ["add", "remove"] + }, + "behavior": { + "injection": 1, + "devnode": 1, + "allow": 1, + "permission": "rw" + } + } + ] + } + ] + }, + "network": { + "static": [ + { + "type": "veth", + "param": { + "name": "veth0", + "link": "lxcbr0", + "flags": "up", + "hwaddr": "00:16:3e:xx:xx:xx", + "mode": "bridge" + } + } + ] + } +} diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/raspberrypi4/agl-momi-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/raspberrypi4/agl-momi-ivi-demo.json deleted file mode 100644 index 52877a3b..00000000 --- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/raspberrypi4/agl-momi-ivi-demo.json +++ /dev/null @@ -1,174 +0,0 @@ -{ - "name": "agl-momi-ivi-demo", - "role": "ivi", - "base": { - "autoboot": true, - "bootpriority": 10, - "rootfs": { - "path": "/opt/container/guests/agl-momi-ivi-demo/rootfs", - "filesystem": "ext4", - "mode": "rw", - "blockdev": [ - "/dev/mmcblk0p5", - "/dev/mmcblk0p5" - ] - }, - "lifecycle": { - "halt": "SIGRTMIN+3", - "reboot": "SIGTERM", - "timeout": 15000 - }, - "cap": { - "drop": "sys_module mac_admin mac_override", - "keep": "" - }, - "environment": [ - "PIPEWIRE_RUNTIME_DIR=/var", - "HOME=/home/root" - ] - }, - "fs": { - "mount": [ - { - "type": "filesystem", - "from": "tmpfs", - "to": "run", - "fstype": "tmpfs", - "option": "defaults 0 0" - }, - { - "type": "directory", - "from": "/sys/kernel/security", - "to": "sys/kernel/security", - "fstype": "none", - "option": "ro,bind,optional 0 0" - }, - { - "type": "directory", - "from": "/run/udev/data", - "to": "run/udev/data", - "fstype": "none", - "option": "ro,bind,optional,create=dir" - }, - { - "type": "directory", - "from": "/run/drm-lease-manager/lease-ivi", - "to": "var/display/drm-lease-manager/lease", - "fstype": "none", - "option": "bind,create=file" - }, - { - "type": "directory", - "from": "/run/pipewire/pipewire-0", - "to": "var/pipewire-0", - "fstype": "none", - "option": "bind,optional,create=file" - }, - { - "type": "directory", - "from": "/run/dlt", - "to": "run/dlt", - "fstype": "none", - "option": "bind,optional,create=dir" - }, - { - "type": "directory", - "from": "/opt/container/guests/agl-momi-ivi-demo/system.conf", - "to": "etc/systemd/system.conf.d/10-environment.conf", - "fstype": "none", - "option": "bind,optional,create=file" - } - ] - }, - "device": { - "static": [ - { - "type": "devdir", - "from": "/dev/dri", - "to": "dev/dri", - "devnode": "/dev/dri/card0", - "optional": 0, - "wideallow": 1, - "exclusive": 0 - }, - { - "type": "devdir", - "from": "/dev/input", - "to": "dev/input", - "devnode": "/dev/input/event0", - "optional": 1, - "wideallow": 1, - "exclusive": 0 - } - ], - "dynamic": [ - { - "devpath": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/", - "items": [ - { - "subsystem": "usb", - "rule": { - "devtype": ["usb_device","usb_interface"], - "action": ["add", "remove"] - }, - "behavior": { - "injection": 1, - "devnode": 0, - "allow": 0, - "permission": "rw" - } - }, - { - "subsystem": "block", - "rule": { - "action": ["add", "remove","change"], - "extra" : [ - { - "checker": "exclude-fs", - "value": "ext4" - } - ] - }, - "behavior": { - "injection": 1, - "devnode": 0, - "allow": 1, - "permission": "rwm" - } - } - ] - }, - { - "devpath": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/", - "items": [ - { - "subsystem": "hid", - "rule": { - "action": ["add", "remove"] - }, - "behavior": { - "injection": 1, - "devnode": 1, - "allow": 1, - "permission": "rw" - } - } - ] - } - ] - }, - "network": { - "static": [ - { - "type": "veth", - "param": { - "name": "eth0", - "link": "lxcbr0", - "flags": "up", - "hwaddr": "00:16:3e:xx:xx:xx", - "mode": "bridge" - } - } - ] - } -} diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/rpi/agl-momi-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/rpi/agl-momi-ivi-demo.json new file mode 100644 index 00000000..52877a3b --- /dev/null +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/rpi/agl-momi-ivi-demo.json @@ -0,0 +1,174 @@ +{ + "name": "agl-momi-ivi-demo", + "role": "ivi", + "base": { + "autoboot": true, + "bootpriority": 10, + "rootfs": { + "path": "/opt/container/guests/agl-momi-ivi-demo/rootfs", + "filesystem": "ext4", + "mode": "rw", + "blockdev": [ + "/dev/mmcblk0p5", + "/dev/mmcblk0p5" + ] + }, + "lifecycle": { + "halt": "SIGRTMIN+3", + "reboot": "SIGTERM", + "timeout": 15000 + }, + "cap": { + "drop": "sys_module mac_admin mac_override", + "keep": "" + }, + "environment": [ + "PIPEWIRE_RUNTIME_DIR=/var", + "HOME=/home/root" + ] + }, + "fs": { + "mount": [ + { + "type": "filesystem", + "from": "tmpfs", + "to": "run", + "fstype": "tmpfs", + "option": "defaults 0 0" + }, + { + "type": "directory", + "from": "/sys/kernel/security", + "to": "sys/kernel/security", + "fstype": "none", + "option": "ro,bind,optional 0 0" + }, + { + "type": "directory", + "from": "/run/udev/data", + "to": "run/udev/data", + "fstype": "none", + "option": "ro,bind,optional,create=dir" + }, + { + "type": "directory", + "from": "/run/drm-lease-manager/lease-ivi", + "to": "var/display/drm-lease-manager/lease", + "fstype": "none", + "option": "bind,create=file" + }, + { + "type": "directory", + "from": "/run/pipewire/pipewire-0", + "to": "var/pipewire-0", + "fstype": "none", + "option": "bind,optional,create=file" + }, + { + "type": "directory", + "from": "/run/dlt", + "to": "run/dlt", + "fstype": "none", + "option": "bind,optional,create=dir" + }, + { + "type": "directory", + "from": "/opt/container/guests/agl-momi-ivi-demo/system.conf", + "to": "etc/systemd/system.conf.d/10-environment.conf", + "fstype": "none", + "option": "bind,optional,create=file" + } + ] + }, + "device": { + "static": [ + { + "type": "devdir", + "from": "/dev/dri", + "to": "dev/dri", + "devnode": "/dev/dri/card0", + "optional": 0, + "wideallow": 1, + "exclusive": 0 + }, + { + "type": "devdir", + "from": "/dev/input", + "to": "dev/input", + "devnode": "/dev/input/event0", + "optional": 1, + "wideallow": 1, + "exclusive": 0 + } + ], + "dynamic": [ + { + "devpath": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/", + "items": [ + { + "subsystem": "usb", + "rule": { + "devtype": ["usb_device","usb_interface"], + "action": ["add", "remove"] + }, + "behavior": { + "injection": 1, + "devnode": 0, + "allow": 0, + "permission": "rw" + } + }, + { + "subsystem": "block", + "rule": { + "action": ["add", "remove","change"], + "extra" : [ + { + "checker": "exclude-fs", + "value": "ext4" + } + ] + }, + "behavior": { + "injection": 1, + "devnode": 0, + "allow": 1, + "permission": "rwm" + } + } + ] + }, + { + "devpath": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/", + "items": [ + { + "subsystem": "hid", + "rule": { + "action": ["add", "remove"] + }, + "behavior": { + "injection": 1, + "devnode": 1, + "allow": 1, + "permission": "rw" + } + } + ] + } + ] + }, + "network": { + "static": [ + { + "type": "veth", + "param": { + "name": "eth0", + "link": "lxcbr0", + "flags": "up", + "hwaddr": "00:16:3e:xx:xx:xx", + "mode": "bridge" + } + } + ] + } +} diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/raspberrypi4/agl-qt-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/raspberrypi4/agl-qt-ivi-demo.json deleted file mode 100644 index c2531044..00000000 --- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/raspberrypi4/agl-qt-ivi-demo.json +++ /dev/null @@ -1,174 +0,0 @@ -{ - "name": "agl-qt-ivi-demo", - "role": "ivi", - "base": { - "autoboot": false, - "bootpriority": 10, - "rootfs": { - "path": "/opt/container/guests/agl-qt-ivi-demo/rootfs", - "filesystem": "ext4", - "mode": "rw", - "blockdev": [ - "/dev/mmcblk0p6", - "/dev/mmcblk0p6" - ] - }, - "lifecycle": { - "halt": "SIGRTMIN+3", - "reboot": "SIGTERM", - "timeout": 15000 - }, - "cap": { - "drop": "sys_module mac_admin mac_override", - "keep": "" - }, - "environment": [ - "PIPEWIRE_RUNTIME_DIR=/var", - "HOME=/home/root" - ] - }, - "fs": { - "mount": [ - { - "type": "filesystem", - "from": "tmpfs", - "to": "run", - "fstype": "tmpfs", - "option": "defaults 0 0" - }, - { - "type": "directory", - "from": "/sys/kernel/security", - "to": "sys/kernel/security", - "fstype": "none", - "option": "ro,bind,optional 0 0" - }, - { - "type": "directory", - "from": "/run/udev/data", - "to": "run/udev/data", - "fstype": "none", - "option": "ro,bind,optional,create=dir" - }, - { - "type": "directory", - "from": "/run/drm-lease-manager/lease-ivi", - "to": "var/display/drm-lease-manager/lease", - "fstype": "none", - "option": "bind,create=file" - }, - { - "type": "directory", - "from": "/run/pipewire/pipewire-0", - "to": "var/pipewire-0", - "fstype": "none", - "option": "bind,optional,create=file" - }, - { - "type": "directory", - "from": "/run/dlt", - "to": "run/dlt", - "fstype": "none", - "option": "bind,optional,create=dir" - }, - { - "type": "directory", - "from": "/opt/container/guests/agl-qt-ivi-demo/system.conf", - "to": "etc/systemd/system.conf.d/10-environment.conf", - "fstype": "none", - "option": "bind,optional,create=file" - } - ] - }, - "device": { - "static": [ - { - "type": "devdir", - "from": "/dev/dri", - "to": "dev/dri", - "devnode": "/dev/dri/card0", - "optional": 0, - "wideallow": 1, - "exclusive": 0 - }, - { - "type": "devdir", - "from": "/dev/input", - "to": "dev/input", - "devnode": "/dev/input/event0", - "optional": 1, - "wideallow": 1, - "exclusive": 0 - } - ], - "dynamic": [ - { - "devpath": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/", - "items": [ - { - "subsystem": "usb", - "rule": { - "devtype": ["usb_device","usb_interface"], - "action": ["add", "remove"] - }, - "behavior": { - "injection": 1, - "devnode": 0, - "allow": 0, - "permission": "rw" - } - }, - { - "subsystem": "block", - "rule": { - "action": ["add", "remove","change"], - "extra" : [ - { - "checker": "exclude-fs", - "value": "ext4" - } - ] - }, - "behavior": { - "injection": 1, - "devnode": 0, - "allow": 1, - "permission": "rwm" - } - } - ] - }, - { - "devpath": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/", - "items": [ - { - "subsystem": "hid", - "rule": { - "action": ["add", "remove"] - }, - "behavior": { - "injection": 1, - "devnode": 1, - "allow": 1, - "permission": "rw" - } - } - ] - } - ] - }, - "network": { - "static": [ - { - "type": "veth", - "param": { - "name": "veth0", - "link": "lxcbr0", - "flags": "up", - "hwaddr": "00:16:3e:xx:xx:xx", - "mode": "bridge" - } - } - ] - } -} diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/rpi/agl-qt-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/rpi/agl-qt-ivi-demo.json new file mode 100644 index 00000000..c2531044 --- /dev/null +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/rpi/agl-qt-ivi-demo.json @@ -0,0 +1,174 @@ +{ + "name": "agl-qt-ivi-demo", + "role": "ivi", + "base": { + "autoboot": false, + "bootpriority": 10, + "rootfs": { + "path": "/opt/container/guests/agl-qt-ivi-demo/rootfs", + "filesystem": "ext4", + "mode": "rw", + "blockdev": [ + "/dev/mmcblk0p6", + "/dev/mmcblk0p6" + ] + }, + "lifecycle": { + "halt": "SIGRTMIN+3", + "reboot": "SIGTERM", + "timeout": 15000 + }, + "cap": { + "drop": "sys_module mac_admin mac_override", + "keep": "" + }, + "environment": [ + "PIPEWIRE_RUNTIME_DIR=/var", + "HOME=/home/root" + ] + }, + "fs": { + "mount": [ + { + "type": "filesystem", + "from": "tmpfs", + "to": "run", + "fstype": "tmpfs", + "option": "defaults 0 0" + }, + { + "type": "directory", + "from": "/sys/kernel/security", + "to": "sys/kernel/security", + "fstype": "none", + "option": "ro,bind,optional 0 0" + }, + { + "type": "directory", + "from": "/run/udev/data", + "to": "run/udev/data", + "fstype": "none", + "option": "ro,bind,optional,create=dir" + }, + { + "type": "directory", + "from": "/run/drm-lease-manager/lease-ivi", + "to": "var/display/drm-lease-manager/lease", + "fstype": "none", + "option": "bind,create=file" + }, + { + "type": "directory", + "from": "/run/pipewire/pipewire-0", + "to": "var/pipewire-0", + "fstype": "none", + "option": "bind,optional,create=file" + }, + { + "type": "directory", + "from": "/run/dlt", + "to": "run/dlt", + "fstype": "none", + "option": "bind,optional,create=dir" + }, + { + "type": "directory", + "from": "/opt/container/guests/agl-qt-ivi-demo/system.conf", + "to": "etc/systemd/system.conf.d/10-environment.conf", + "fstype": "none", + "option": "bind,optional,create=file" + } + ] + }, + "device": { + "static": [ + { + "type": "devdir", + "from": "/dev/dri", + "to": "dev/dri", + "devnode": "/dev/dri/card0", + "optional": 0, + "wideallow": 1, + "exclusive": 0 + }, + { + "type": "devdir", + "from": "/dev/input", + "to": "dev/input", + "devnode": "/dev/input/event0", + "optional": 1, + "wideallow": 1, + "exclusive": 0 + } + ], + "dynamic": [ + { + "devpath": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/", + "items": [ + { + "subsystem": "usb", + "rule": { + "devtype": ["usb_device","usb_interface"], + "action": ["add", "remove"] + }, + "behavior": { + "injection": 1, + "devnode": 0, + "allow": 0, + "permission": "rw" + } + }, + { + "subsystem": "block", + "rule": { + "action": ["add", "remove","change"], + "extra" : [ + { + "checker": "exclude-fs", + "value": "ext4" + } + ] + }, + "behavior": { + "injection": 1, + "devnode": 0, + "allow": 1, + "permission": "rwm" + } + } + ] + }, + { + "devpath": "/devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/", + "items": [ + { + "subsystem": "hid", + "rule": { + "action": ["add", "remove"] + }, + "behavior": { + "injection": 1, + "devnode": 1, + "allow": 1, + "permission": "rw" + } + } + ] + } + ] + }, + "network": { + "static": [ + { + "type": "veth", + "param": { + "name": "veth0", + "link": "lxcbr0", + "flags": "up", + "hwaddr": "00:16:3e:xx:xx:xx", + "mode": "bridge" + } + } + ] + } +} diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/raspberrypi4/cluster-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/raspberrypi4/cluster-demo.json deleted file mode 100644 index d4eb8569..00000000 --- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/raspberrypi4/cluster-demo.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "name": "cluster-demo", - "role": "cluster", - "base": { - "autoboot": true, - "bootpriority": 1, - "rootfs": { - "path": "/opt/container/guests/cluster-demo/rootfs", - "filesystem": "ext4", - "mode": "rw", - "blockdev": [ - "/dev/mmcblk0p3", - "/dev/mmcblk0p3" - ] - }, - "lifecycle": { - "halt": "SIGRTMIN+3", - "reboot": "SIGTERM", - "timeout": 5000 - }, - "cap": { - "drop": "sys_module mac_admin mac_override sys_time", - "keep": "" - }, - "environment": [ - "HOME=/home/root" - ] - }, - "fs": { - "mount": [ - { - "type": "filesystem", - "from": "tmpfs", - "to": "run", - "fstype": "tmpfs", - "option": "defaults 0 0" - }, - { - "type": "directory", - "from": "/sys/kernel/security", - "to": "sys/kernel/security", - "fstype": "none", - "option": "ro,bind,optional 0 0" - }, - { - "type": "directory", - "from": "/run/drm-lease-manager/lease-cluster", - "to": "var/display/drm-lease-manager/lease", - "fstype": "none", - "option": "bind,create=file" - }, - { - "type": "directory", - "from": "/run/pipewire/icipc-0", - "to": "var/icipc-0", - "fstype": "none", - "option": "bind,optional,create=file" - }, - { - "type": "directory", - "from": "/run/dlt", - "to": "run/dlt", - "fstype": "none", - "option": "bind,optional,create=dir" - }, - { - "type": "directory", - "from": "/opt/container/guests/cluster-demo/system.conf", - "to": "etc/systemd/system.conf.d/10-environment.conf", - "fstype": "none", - "option": "bind,optional,create=file" - } - ] - }, - "device": { - "static": [ - { - "type": "devdir", - "from": "/dev/dri", - "to": "dev/dri", - "devnode": "/dev/dri/card0", - "optional": 0, - "wideallow": 1, - "exclusive": 0 - } - ] - }, - "network": { - "static": [ - { - "type": "veth", - "param": { - "name": "veth0", - "link": "lxcbr0", - "flags": "up", - "hwaddr": "00:16:3e:xx:xx:xx", - "mode": "bridge" - } - } - ] - } -} diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/rpi/cluster-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/rpi/cluster-demo.json new file mode 100644 index 00000000..d4eb8569 --- /dev/null +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/rpi/cluster-demo.json @@ -0,0 +1,102 @@ +{ + "name": "cluster-demo", + "role": "cluster", + "base": { + "autoboot": true, + "bootpriority": 1, + "rootfs": { + "path": "/opt/container/guests/cluster-demo/rootfs", + "filesystem": "ext4", + "mode": "rw", + "blockdev": [ + "/dev/mmcblk0p3", + "/dev/mmcblk0p3" + ] + }, + "lifecycle": { + "halt": "SIGRTMIN+3", + "reboot": "SIGTERM", + "timeout": 5000 + }, + "cap": { + "drop": "sys_module mac_admin mac_override sys_time", + "keep": "" + }, + "environment": [ + "HOME=/home/root" + ] + }, + "fs": { + "mount": [ + { + "type": "filesystem", + "from": "tmpfs", + "to": "run", + "fstype": "tmpfs", + "option": "defaults 0 0" + }, + { + "type": "directory", + "from": "/sys/kernel/security", + "to": "sys/kernel/security", + "fstype": "none", + "option": "ro,bind,optional 0 0" + }, + { + "type": "directory", + "from": "/run/drm-lease-manager/lease-cluster", + "to": "var/display/drm-lease-manager/lease", + "fstype": "none", + "option": "bind,create=file" + }, + { + "type": "directory", + "from": "/run/pipewire/icipc-0", + "to": "var/icipc-0", + "fstype": "none", + "option": "bind,optional,create=file" + }, + { + "type": "directory", + "from": "/run/dlt", + "to": "run/dlt", + "fstype": "none", + "option": "bind,optional,create=dir" + }, + { + "type": "directory", + "from": "/opt/container/guests/cluster-demo/system.conf", + "to": "etc/systemd/system.conf.d/10-environment.conf", + "fstype": "none", + "option": "bind,optional,create=file" + } + ] + }, + "device": { + "static": [ + { + "type": "devdir", + "from": "/dev/dri", + "to": "dev/dri", + "devnode": "/dev/dri/card0", + "optional": 0, + "wideallow": 1, + "exclusive": 0 + } + ] + }, + "network": { + "static": [ + { + "type": "veth", + "param": { + "name": "veth0", + "link": "lxcbr0", + "flags": "up", + "hwaddr": "00:16:3e:xx:xx:xx", + "mode": "bridge" + } + } + ] + } +} diff --git a/meta-agl-ic-container/recipes-graphics/drm-lease-manager/drm-lease-manager-init/raspberrypi4/drm-lease-manager.ini b/meta-agl-ic-container/recipes-graphics/drm-lease-manager/drm-lease-manager-init/raspberrypi4/drm-lease-manager.ini deleted file mode 100644 index 45ecfc27..00000000 --- a/meta-agl-ic-container/recipes-graphics/drm-lease-manager/drm-lease-manager-init/raspberrypi4/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-ic-container/recipes-graphics/drm-lease-manager/drm-lease-manager-init/rpi/drm-lease-manager.ini b/meta-agl-ic-container/recipes-graphics/drm-lease-manager/drm-lease-manager-init/rpi/drm-lease-manager.ini new file mode 100644 index 00000000..45ecfc27 --- /dev/null +++ b/meta-agl-ic-container/recipes-graphics/drm-lease-manager/drm-lease-manager-init/rpi/drm-lease-manager.ini @@ -0,0 +1,7 @@ +[[lease]] +name="lease-ivi" +connectors=["HDMI-A-1"] + +[[lease]] +name="lease-cluster" +connectors=["HDMI-A-2"] diff --git a/meta-agl-ic-container/recipes-platform/images/guest-image-cluster-demo.bb b/meta-agl-ic-container/recipes-platform/images/guest-image-cluster-demo.bb index be3a8848..d783054b 100644 --- a/meta-agl-ic-container/recipes-platform/images/guest-image-cluster-demo.bb +++ b/meta-agl-ic-container/recipes-platform/images/guest-image-cluster-demo.bb @@ -13,7 +13,7 @@ IMAGE_INSTALL += " \ pipewire-ic-ipc \ " -IMAGE_INSTALL:append:raspberrypi4 = " mesa-megadriver" +IMAGE_INSTALL:append:rpi = " mesa-megadriver" IMAGE_OVERHEAD_FACTOR = "0" EXTRA_IMAGECMD:append = " -L agl-cluster" diff --git a/meta-agl-ic-container/recipes-platform/images/guest-image-drm-lease-test-cluster.bb b/meta-agl-ic-container/recipes-platform/images/guest-image-drm-lease-test-cluster.bb index 13563da8..d580c2f4 100644 --- a/meta-agl-ic-container/recipes-platform/images/guest-image-drm-lease-test-cluster.bb +++ b/meta-agl-ic-container/recipes-platform/images/guest-image-drm-lease-test-cluster.bb @@ -10,4 +10,4 @@ IMAGE_INSTALL += " \ weston-ini-conf-drm-lease-test-cluster \ " -IMAGE_INSTALL:append:raspberrypi4 = " mesa-megadriver" +IMAGE_INSTALL:append:rpi = " mesa-megadriver" diff --git a/meta-agl-ic-container/recipes-platform/images/guest-image-drm-lease-test-ivi.bb b/meta-agl-ic-container/recipes-platform/images/guest-image-drm-lease-test-ivi.bb index be8fcbff..8ce41297 100644 --- a/meta-agl-ic-container/recipes-platform/images/guest-image-drm-lease-test-ivi.bb +++ b/meta-agl-ic-container/recipes-platform/images/guest-image-drm-lease-test-ivi.bb @@ -10,4 +10,4 @@ IMAGE_INSTALL += " \ weston-ini-conf-drm-lease-test-ivi \ " -IMAGE_INSTALL:append:raspberrypi4 = " mesa-megadriver" +IMAGE_INSTALL:append:rpi = " mesa-megadriver" diff --git a/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb b/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb index 4ac579a4..22184578 100644 --- a/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb +++ b/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb @@ -27,7 +27,7 @@ IMAGE_INSTALL += " \ wireplumber-policy-config-agl \ " -IMAGE_INSTALL:append:raspberrypi4 = " mesa-megadriver" +IMAGE_INSTALL:append:rpi = " mesa-megadriver" IMAGE_OVERHEAD_FACTOR = "0" EXTRA_IMAGECMD:append = " -L agl-momi-ivi" -- cgit 1.2.3-korg