diff options
author | Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp> | 2024-12-01 15:30:31 +0900 |
---|---|---|
committer | Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp> | 2024-12-01 16:05:56 +0900 |
commit | c152bca6461c72d527af8f38545d8a0bc2324747 (patch) | |
tree | be8e1b49899abf5b1c1bac777f9df109127cbca9 /meta-agl-ic-container/dynamic-layers/meta-raspberrypi/recipes-container/lxc-config | |
parent | 27116c59302f63f6f9e4a1fdf5c089092e987298 (diff) |
Remove integration type without container manager from container integration
Existing container integration was supporing with container-manager and
without container-manager integration. After the scarthgap update,
systemd cgroup-v1 and v2 mixed support was disabled. It require to big
rework in resource controle feature.
The lxc only integration (without container-manager integration) has some
limitation for device support. For example, it can't handle dynamic
device/network interface change, it' can't protect device access from
guest using mknod. On the other hand, if I mantain to this integration,
it need many human resource. The lxc only integration does not have
value for these work.
This change drop lxc only integration. This strategy was discussed
in gerrit 30506.
Bug-AGL: SPEC-5283
Change-Id: I66b209cdf7fa6bf77439a24211de4da7dcdfa873
Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
Diffstat (limited to 'meta-agl-ic-container/dynamic-layers/meta-raspberrypi/recipes-container/lxc-config')
5 files changed, 0 insertions, 49 deletions
diff --git a/meta-agl-ic-container/dynamic-layers/meta-raspberrypi/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in b/meta-agl-ic-container/dynamic-layers/meta-raspberrypi/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in deleted file mode 100644 index fdb51877..00000000 --- a/meta-agl-ic-container/dynamic-layers/meta-raspberrypi/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in +++ /dev/null @@ -1,13 +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 = /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.mount.entry = /run/pipewire/icipc-0 var/icipc-0 none bind,optional,create=file - diff --git a/meta-agl-ic-container/dynamic-layers/meta-raspberrypi/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bbappend b/meta-agl-ic-container/dynamic-layers/meta-raspberrypi/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bbappend deleted file mode 100644 index 07fc0da3..00000000 --- a/meta-agl-ic-container/dynamic-layers/meta-raspberrypi/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -require conf/include/drm-lease-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-ic-container/dynamic-layers/meta-raspberrypi/recipes-container/lxc-config/lxc-config-ivi-demo/mount.in b/meta-agl-ic-container/dynamic-layers/meta-raspberrypi/recipes-container/lxc-config/lxc-config-ivi-demo/mount.in deleted file mode 100644 index ab6f7540..00000000 --- a/meta-agl-ic-container/dynamic-layers/meta-raspberrypi/recipes-container/lxc-config/lxc-config-ivi-demo/mount.in +++ /dev/null @@ -1,18 +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 = /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.mount.entry = /run/pipewire/pipewire-0 var/pipewire-0 none bind,optional,create=file - diff --git a/meta-agl-ic-container/dynamic-layers/meta-raspberrypi/recipes-container/lxc-config/lxc-config-ivi-demo/network.in b/meta-agl-ic-container/dynamic-layers/meta-raspberrypi/recipes-container/lxc-config/lxc-config-ivi-demo/network.in deleted file mode 100644 index 6545b1ad..00000000 --- a/meta-agl-ic-container/dynamic-layers/meta-raspberrypi/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-ic-container/dynamic-layers/meta-raspberrypi/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bbappend b/meta-agl-ic-container/dynamic-layers/meta-raspberrypi/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bbappend deleted file mode 100644 index f3a0e60d..00000000 --- a/meta-agl-ic-container/dynamic-layers/meta-raspberrypi/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -require conf/include/drm-lease-multi-display.inc - -FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" - -LXC_AUTO_START ?= "${@bb.utils.contains("HAS_MULTI_DISPLAY", "1", "1", "0" ,d)}" |