From 150c77a0fb6d36c1aba4e7ec9b7fd784328ec933 Mon Sep 17 00:00:00 2001 From: Naoto Yamaguchi Date: Sun, 2 Jun 2024 16:57:52 +0900 Subject: Adjust image based on RR release policy Change image name to new naming. Remove dropped image from multi container integration. Bug-AGL: SPEC-5158 Change-Id: I5fad2dbac1f0302f170f08d4a6d538db43fd1e4c Signed-off-by: Naoto Yamaguchi --- .../agl-html5-ivi-demo.json | 3 - .../raspberrypi4/agl-html5-ivi-demo.json | 174 -------------------- .../rcar-gen3/agl-html5-ivi-demo.json | 183 --------------------- .../system.conf.agl-html5-ivi-demo.in | 2 - 4 files changed, 362 deletions(-) delete mode 100644 meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/agl-html5-ivi-demo.json delete mode 100644 meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/raspberrypi4/agl-html5-ivi-demo.json delete mode 100644 meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/rcar-gen3/agl-html5-ivi-demo.json delete mode 100644 meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/system.conf.agl-html5-ivi-demo.in (limited to 'meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo') diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/agl-html5-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/agl-html5-ivi-demo.json deleted file mode 100644 index 73e321be..00000000 --- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/agl-html5-ivi-demo.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name": "agl-html5-ivi-demo" -} 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 deleted file mode 100644 index 508ba225..00000000 --- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/raspberrypi4/agl-html5-ivi-demo.json +++ /dev/null @@ -1,174 +0,0 @@ -{ - "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": "/run/dlt", - "to": "run/dlt", - "fstype": "none", - "option": "bind,optional,create=dir" - }, - { - "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-html5-ivi-demo/rcar-gen3/agl-html5-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/rcar-gen3/agl-html5-ivi-demo.json deleted file mode 100644 index fd92b73e..00000000 --- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/rcar-gen3/agl-html5-ivi-demo.json +++ /dev/null @@ -1,183 +0,0 @@ -{ - "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/mmcblk1p6", - "/dev/mmcblk1p6" - ] - }, - "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-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 - }, - { - "type": "devnode", - "from": "/dev/pvr_sync", - "to": "dev/pvr_sync", - "devnode": "/dev/pvr_sync", - "optional": 0, - "wideallow": 0, - "exclusive": 0 - } - ], - "dynamic": [ - { - "devpath": "/devices/platform/soc/ee0a0100.usb/usb2/", - "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/soc/ee0a0100.usb/usb2/", - "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/system.conf.agl-html5-ivi-demo.in b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/system.conf.agl-html5-ivi-demo.in deleted file mode 100644 index 7605d25f..00000000 --- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/system.conf.agl-html5-ivi-demo.in +++ /dev/null @@ -1,2 +0,0 @@ -[Manager] -DefaultEnvironment = PIPEWIRE_RUNTIME_DIR=/var -- cgit 1.2.3-korg