From e394dc88e3acc56bde094ccfa044da23998491db Mon Sep 17 00:00:00 2001 From: Naoto Yamaguchi Date: Fri, 12 May 2023 00:16:58 +0900 Subject: Move configuration files to subdirectory for raspberrypi4 In https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-devel/+/28799, I got a review comment for place of configuration files. This patch fix place of configuration files for raspberry pi 4. Bug-AGL : SPEC-4790 Change-Id: I6d2acc2a4f611dd68d34146a40d93abb4e0eed51 Signed-off-by: Naoto Yamaguchi --- .../raspberrypi4/agl-flutter-ivi-demo.json | 166 ++++++++++++++++++++ .../raspberrypi4/agl-html5-ivi-demo.json | 167 +++++++++++++++++++++ .../raspberrypi4/agl-momi-ivi-demo.json | 167 +++++++++++++++++++++ .../raspberrypi4/agl-qt-ivi-demo.json | 167 +++++++++++++++++++++ .../raspberrypi4/cluster-demo.json | 95 ++++++++++++ 5 files changed, 762 insertions(+) create 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-html5-ivi-demo/raspberrypi4/agl-html5-ivi-demo.json create 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-qt-ivi-demo/raspberrypi4/agl-qt-ivi-demo.json create mode 100644 meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/raspberrypi4/cluster-demo.json (limited to 'meta-agl-ic-container/recipes-container/container-manager-config') 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 new file mode 100644 index 00000000..4393703b --- /dev/null +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/raspberrypi4/agl-flutter-ivi-demo.json @@ -0,0 +1,166 @@ +{ + "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": "/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-html5-ivi-demo/raspberrypi4/agl-html5-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/raspberrypi4/agl-html5-ivi-demo.json new file mode 100644 index 00000000..a569bcf5 --- /dev/null +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/raspberrypi4/agl-html5-ivi-demo.json @@ -0,0 +1,167 @@ +{ + "name": "agl-html5-ivi-demo", + "role": "ivi", + "base": { + "autoboot": false, + "bootpriority": 10, + "rootfs": { + "path": "/opt/container/guests/agl-html5-ivi-demo/rootfs", + "filesystem": "ext4", + "mode": "rw", + "blockdev": [ + "/dev/mmcblk0p8", + "/dev/mmcblk0p8" + ] + }, + "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": "/opt/container/guests/agl-html5-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 new file mode 100644 index 00000000..24e02758 --- /dev/null +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/raspberrypi4/agl-momi-ivi-demo.json @@ -0,0 +1,167 @@ +{ + "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": "/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 new file mode 100644 index 00000000..62ccbc14 --- /dev/null +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/raspberrypi4/agl-qt-ivi-demo.json @@ -0,0 +1,167 @@ +{ + "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": "/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 new file mode 100644 index 00000000..80f10cd6 --- /dev/null +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/raspberrypi4/cluster-demo.json @@ -0,0 +1,95 @@ +{ + "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": "/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" + } + } + ] + } +} -- cgit 1.2.3-korg