summaryrefslogtreecommitdiffstats
path: root/meta-agl-ic-container
diff options
context:
space:
mode:
authorNaoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>2024-12-01 15:30:31 +0900
committerNaoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>2024-12-01 16:05:56 +0900
commitc152bca6461c72d527af8f38545d8a0bc2324747 (patch)
treebe8e1b49899abf5b1c1bac777f9df109127cbca9 /meta-agl-ic-container
parent27116c59302f63f6f9e4a1fdf5c089092e987298 (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')
-rw-r--r--meta-agl-ic-container/classes/lxc-config.bbclass58
-rw-r--r--meta-agl-ic-container/conf/include/drm-lease-multi-display.inc6
-rw-r--r--meta-agl-ic-container/conf/include/mc-conf-default.inc2
-rw-r--r--meta-agl-ic-container/dynamic-layers/meta-raspberrypi/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in13
-rw-r--r--meta-agl-ic-container/dynamic-layers/meta-raspberrypi/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bbappend8
-rw-r--r--meta-agl-ic-container/dynamic-layers/meta-raspberrypi/recipes-container/lxc-config/lxc-config-ivi-demo/mount.in18
-rw-r--r--meta-agl-ic-container/dynamic-layers/meta-raspberrypi/recipes-container/lxc-config/lxc-config-ivi-demo/network.in5
-rw-r--r--meta-agl-ic-container/dynamic-layers/meta-raspberrypi/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bbappend5
-rw-r--r--meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in17
-rw-r--r--meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bbappend8
-rw-r--r--meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo/mount.in22
-rw-r--r--meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo/network.in5
-rw-r--r--meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bbappend5
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/basic.in9
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/environment.in7
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/misc.in3
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in14
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/network.in3
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/system.conf.cluster-demo.in2
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bb7
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster/basic.in9
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster/environment.in8
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster/misc.in3
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster/mount.in17
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster/network.in5
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster/system.conf.drm-lease-test-cluster.in2
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster_1.0.bb7
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi/basic.in9
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi/environment.in8
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi/misc.in3
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi/mount.in17
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi/network.in5
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi/system.conf.drm-lease-test-ivi.in2
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi_1.0.bb7
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy/basic.in9
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy/environment.in2
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy/misc.in3
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy/mount.in7
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy/network.in3
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy/system.conf.dummy.in2
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy_1.0.bb5
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/basic.in9
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/environment.in8
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/misc.in3
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/mount.in17
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/network.in5
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/system.conf.ivi-demo.in2
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bb9
-rw-r--r--meta-agl-ic-container/recipes-container/lxc-config/multi-display.inc1
-rw-r--r--meta-agl-ic-container/recipes-platform/images/agl-cluster-demo-lxc-host.bb35
-rw-r--r--meta-agl-ic-container/recipes-platform/images/agl-lxc-autostart.inc19
-rw-r--r--meta-agl-ic-container/recipes-platform/images/agl-lxc-install-single-image.inc21
52 files changed, 0 insertions, 479 deletions
diff --git a/meta-agl-ic-container/classes/lxc-config.bbclass b/meta-agl-ic-container/classes/lxc-config.bbclass
deleted file mode 100644
index 921aaf92..00000000
--- a/meta-agl-ic-container/classes/lxc-config.bbclass
+++ /dev/null
@@ -1,58 +0,0 @@
-# Helper class for installing LXC guest configuration.
-# Assumes that:
-# - Recipe name is 'lxc-config-' + <guest name>
-# - Corresponding files {config,system.conf}.<guest name>.in are in
-# the file search path
-# - That references to the DRM lease device name are parameterized
-# with @DRM_LEASE_DEVICE@ in the .in files
-# As well:
-# - The .in files can optionally use the @LXC_AUTO_START@ parameter
-# to pick up the value of the LXC_AUTO_START variable for use in
-# defining lxc.start.auto. The default value is "0", so recipes
-# need to assign the variable to "1" to have the associated
-# container start automatically.
-
-python __anonymous() {
- bpn = d.getVar('BPN')
- if not bpn.startswith('lxc-config-'):
- bb.error('Recipe name does not start with \'lxc-config-\'')
- config = bpn[11:]
- d.setVar('LXC_CONFIG_NAME', config)
- src_uri = 'file://basic.in' \
- + ' file://mount.in' \
- + ' file://network.in' \
- + ' file://environment.in' \
- + ' file://misc.in' \
- + ' file://system.conf.' + config + '.in'
- d.setVar('SRC_URI', src_uri)
-}
-
-S = "${WORKDIR}"
-
-inherit allarch
-
-DRM_LEASE_DEVICE ??= "card0-HDMI-A-1"
-
-DRM_LEASE_DEVICE:qemuall ?= "card0-Virtual-1"
-
-LXC_AUTO_START ??= "0"
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-do_install () {
- rm -f ${WORKDIR}/config.${LXC_CONFIG_NAME}.in
- files="basic.in mount.in network.in environment.in misc.in"
- for f in ${files}; do
- cat ${WORKDIR}/$f >> ${WORKDIR}/config.${LXC_CONFIG_NAME}.in
- done
-
- install -m 0755 -d ${D}/var/lib/lxc/${LXC_CONFIG_NAME}
- for f in config.${LXC_CONFIG_NAME}.in system.conf.${LXC_CONFIG_NAME}.in; do
- sed -e 's|@DRM_LEASE_DEVICE@|${DRM_LEASE_DEVICE}|g' \
- -e 's|@LXC_AUTO_START@|${LXC_AUTO_START}|g' \
- ${WORKDIR}/$f > ${D}${localstatedir}/lib/lxc/${LXC_CONFIG_NAME}/${f%.${LXC_CONFIG_NAME}.in}
- done
-}
-
-FILES:${PN} = "${localstatedir}/lib/lxc/"
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
deleted file mode 100644
index 398958f5..00000000
--- a/meta-agl-ic-container/conf/include/drm-lease-multi-display.inc
+++ /dev/null
@@ -1,6 +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)}"
-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/conf/include/mc-conf-default.inc b/meta-agl-ic-container/conf/include/mc-conf-default.inc
deleted file mode 100644
index 1d3022e4..00000000
--- a/meta-agl-ic-container/conf/include/mc-conf-default.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-# We don't want the app framework or demo bits in the host image.
-AGL_FEATURES:remove = "agl-app-fw agldemo agl-flutter"
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)}"
diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in b/meta-agl-ic-container/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-ic-container/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-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bbappend b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/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-rcar-gen3/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-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo/mount.in b/meta-agl-ic-container/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-ic-container/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-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo/network.in b/meta-agl-ic-container/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-ic-container/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-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bbappend b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/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-rcar-gen3/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)}"
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/basic.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/basic.in
deleted file mode 100644
index 22a8f8de..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/basic.in
+++ /dev/null
@@ -1,9 +0,0 @@
-# lxc basic setting
-lxc.rootfs.path = dir:/var/lib/machines/cluster-demo
-lxc.signal.halt = SIGRTMIN+3
-lxc.signal.reboot = SIGTERM
-lxc.uts.name = "cluster"
-lxc.tty.max = 1
-lxc.pty.max = 1
-lxc.cap.drop = sys_module mac_admin mac_override sys_time
-
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/environment.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/environment.in
deleted file mode 100644
index 374b9c03..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/environment.in
+++ /dev/null
@@ -1,7 +0,0 @@
-# lxc environment variable setting
-lxc.environment = QT_QPA_PLATFORM=wayland
-lxc.environment = QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/
-lxc.environment = QML_IMPORT_PATH=/usr/lib/qml/
-lxc.environment = QML2_IMPORT_PATH=/usr/lib/qml/
-lxc.environment = QT_WAYLAND_SHELL_INTEGRATION=xdg-shell
-
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/misc.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/misc.in
deleted file mode 100644
index 9b4f4883..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/misc.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# lxc misc setting
-lxc.start.auto = @LXC_AUTO_START@
-
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in
deleted file mode 100644
index a87322ba..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in
+++ /dev/null
@@ -1,14 +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.mount.entry = /run/pipewire/icipc-0 var/icipc-0 none bind,optional,create=file
-
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/network.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/network.in
deleted file mode 100644
index 573f4796..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/network.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# lxc network setting
-lxc.net.0.type = empty
-
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/system.conf.cluster-demo.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/system.conf.cluster-demo.in
deleted file mode 100644
index f496c589..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/system.conf.cluster-demo.in
+++ /dev/null
@@ -1,2 +0,0 @@
-[Manager]
-#DefaultEnvironment =
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bb b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bb
deleted file mode 100644
index a30505e9..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-DESCRIPTION = "AGL cluster demo container LXC config"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
-
-inherit lxc-config
-
-LXC_AUTO_START ??= "1"
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster/basic.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster/basic.in
deleted file mode 100644
index d4a490ab..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster/basic.in
+++ /dev/null
@@ -1,9 +0,0 @@
-# lxc basic setting
-lxc.rootfs.path = dir:/var/lib/machines/drm-lease-test-cluster
-lxc.signal.halt = SIGRTMIN+3
-lxc.signal.reboot = SIGTERM
-lxc.uts.name = "cluster"
-lxc.tty.max = 1
-lxc.pty.max = 1
-lxc.cap.drop = sys_module mac_admin mac_override sys_time
-
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster/environment.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster/environment.in
deleted file mode 100644
index 632252d5..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster/environment.in
+++ /dev/null
@@ -1,8 +0,0 @@
-# lxc environment variable setting
-lxc.environment = QT_QPA_PLATFORM=wayland
-lxc.environment = QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/
-lxc.environment = QML_IMPORT_PATH=/usr/lib/qml/
-lxc.environment = QML2_IMPORT_PATH=/usr/lib/qml/
-lxc.environment = QT_WAYLAND_SHELL_INTEGRATION=xdg-shell
-lxc.environment = PIPEWIRE_RUNTIME_DIR=/var
-
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster/misc.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster/misc.in
deleted file mode 100644
index 9b4f4883..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster/misc.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# lxc misc setting
-lxc.start.auto = @LXC_AUTO_START@
-
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster/mount.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster/mount.in
deleted file mode 100644
index 0468866d..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster/mount.in
+++ /dev/null
@@ -1,17 +0,0 @@
-# lxc mount setting
-lxc.mount.entry = /var/lib/lxc/drm-lease-test-cluster/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.mount.entry = /run/pipewire/pipewire-0 var/pipewire-0 none bind,optional,create=file
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster/network.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster/network.in
deleted file mode 100644
index 87fff1de..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster/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:a5
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster/system.conf.drm-lease-test-cluster.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster/system.conf.drm-lease-test-cluster.in
deleted file mode 100644
index f496c589..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster/system.conf.drm-lease-test-cluster.in
+++ /dev/null
@@ -1,2 +0,0 @@
-[Manager]
-#DefaultEnvironment =
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster_1.0.bb b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster_1.0.bb
deleted file mode 100644
index a30505e9..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-cluster_1.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-DESCRIPTION = "AGL cluster demo container LXC config"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
-
-inherit lxc-config
-
-LXC_AUTO_START ??= "1"
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi/basic.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi/basic.in
deleted file mode 100644
index 186ab509..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi/basic.in
+++ /dev/null
@@ -1,9 +0,0 @@
-# lxc basic setting
-lxc.rootfs.path = dir:/var/lib/machines/drm-lease-test-ivi
-lxc.signal.halt = SIGRTMIN+3
-lxc.signal.reboot = SIGTERM
-lxc.uts.name = "ivi"
-lxc.tty.max = 1
-lxc.pty.max = 1
-lxc.cap.drop = sys_module mac_admin mac_override sys_time
-
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi/environment.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi/environment.in
deleted file mode 100644
index 632252d5..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi/environment.in
+++ /dev/null
@@ -1,8 +0,0 @@
-# lxc environment variable setting
-lxc.environment = QT_QPA_PLATFORM=wayland
-lxc.environment = QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/
-lxc.environment = QML_IMPORT_PATH=/usr/lib/qml/
-lxc.environment = QML2_IMPORT_PATH=/usr/lib/qml/
-lxc.environment = QT_WAYLAND_SHELL_INTEGRATION=xdg-shell
-lxc.environment = PIPEWIRE_RUNTIME_DIR=/var
-
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi/misc.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi/misc.in
deleted file mode 100644
index 9b4f4883..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi/misc.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# lxc misc setting
-lxc.start.auto = @LXC_AUTO_START@
-
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi/mount.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi/mount.in
deleted file mode 100644
index 2026c577..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi/mount.in
+++ /dev/null
@@ -1,17 +0,0 @@
-# lxc mount setting
-lxc.mount.entry = /var/lib/lxc/drm-lease-test-ivi/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.mount.entry = /run/pipewire/pipewire-0 var/pipewire-0 none bind,optional,create=file
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi/network.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi/network.in
deleted file mode 100644
index 6545b1ad..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi/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/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi/system.conf.drm-lease-test-ivi.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi/system.conf.drm-lease-test-ivi.in
deleted file mode 100644
index f496c589..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi/system.conf.drm-lease-test-ivi.in
+++ /dev/null
@@ -1,2 +0,0 @@
-[Manager]
-#DefaultEnvironment =
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi_1.0.bb b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi_1.0.bb
deleted file mode 100644
index a30505e9..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-drm-lease-test-ivi_1.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-DESCRIPTION = "AGL cluster demo container LXC config"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
-
-inherit lxc-config
-
-LXC_AUTO_START ??= "1"
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy/basic.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy/basic.in
deleted file mode 100644
index 603e902e..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy/basic.in
+++ /dev/null
@@ -1,9 +0,0 @@
-# lxc basic setting
-lxc.rootfs.path = dir:/var/lib/machines/dummy
-lxc.signal.halt = SIGRTMIN+3
-lxc.signal.reboot = SIGTERM
-lxc.uts.name = "guest-dummy"
-lxc.tty.max = 1
-lxc.pty.max = 1
-lxc.cap.drop = sys_module mac_admin mac_override sys_time
-
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy/environment.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy/environment.in
deleted file mode 100644
index b7cde1c8..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy/environment.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# lxc environment variable setting
-
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy/misc.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy/misc.in
deleted file mode 100644
index 9b4f4883..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy/misc.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# lxc misc setting
-lxc.start.auto = @LXC_AUTO_START@
-
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy/mount.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy/mount.in
deleted file mode 100644
index 686fdcb9..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy/mount.in
+++ /dev/null
@@ -1,7 +0,0 @@
-# lxc mount setting
-lxc.mount.entry = /var/lib/lxc/dummy/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
-
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy/network.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy/network.in
deleted file mode 100644
index 573f4796..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy/network.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# lxc network setting
-lxc.net.0.type = empty
-
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy/system.conf.dummy.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy/system.conf.dummy.in
deleted file mode 100644
index f496c589..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy/system.conf.dummy.in
+++ /dev/null
@@ -1,2 +0,0 @@
-[Manager]
-#DefaultEnvironment =
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy_1.0.bb b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy_1.0.bb
deleted file mode 100644
index 41246391..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-dummy_1.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-DESCRIPTION = "AGL dummy container LXC config"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
-
-inherit lxc-config
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/basic.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/basic.in
deleted file mode 100644
index 1fd9f347..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/basic.in
+++ /dev/null
@@ -1,9 +0,0 @@
-# lxc basic setting
-lxc.rootfs.path = dir:/var/lib/machines/ivi-demo
-lxc.signal.halt = SIGRTMIN+3
-lxc.signal.reboot = SIGTERM
-lxc.uts.name = "ivi"
-lxc.tty.max = 1
-lxc.pty.max = 1
-lxc.cap.drop = sys_module mac_admin mac_override sys_time
-
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/environment.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/environment.in
deleted file mode 100644
index 632252d5..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/environment.in
+++ /dev/null
@@ -1,8 +0,0 @@
-# lxc environment variable setting
-lxc.environment = QT_QPA_PLATFORM=wayland
-lxc.environment = QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/
-lxc.environment = QML_IMPORT_PATH=/usr/lib/qml/
-lxc.environment = QML2_IMPORT_PATH=/usr/lib/qml/
-lxc.environment = QT_WAYLAND_SHELL_INTEGRATION=xdg-shell
-lxc.environment = PIPEWIRE_RUNTIME_DIR=/var
-
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/misc.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/misc.in
deleted file mode 100644
index 9b4f4883..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/misc.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# lxc misc setting
-lxc.start.auto = @LXC_AUTO_START@
-
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/mount.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/mount.in
deleted file mode 100644
index 262f09bd..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/mount.in
+++ /dev/null
@@ -1,17 +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.mount.entry = /run/pipewire/pipewire-0 var/pipewire-0 none bind,optional,create=file
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/network.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/network.in
deleted file mode 100644
index 6545b1ad..00000000
--- a/meta-agl-ic-container/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/recipes-container/lxc-config/lxc-config-ivi-demo/system.conf.ivi-demo.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/system.conf.ivi-demo.in
deleted file mode 100644
index 7605d25f..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/system.conf.ivi-demo.in
+++ /dev/null
@@ -1,2 +0,0 @@
-[Manager]
-DefaultEnvironment = PIPEWIRE_RUNTIME_DIR=/var
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bb b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bb
deleted file mode 100644
index 05e3bab0..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "AGL simple IVI demo container LXC config"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
-
-inherit lxc-config
-
-require multi-display.inc
-
-LXC_AUTO_START ??= "${@bb.utils.contains("HAS_MULTI_DISPLAY", "1", "1", "0" ,d)}"
diff --git a/meta-agl-ic-container/recipes-container/lxc-config/multi-display.inc b/meta-agl-ic-container/recipes-container/lxc-config/multi-display.inc
deleted file mode 100644
index 9d1e4fdf..00000000
--- a/meta-agl-ic-container/recipes-container/lxc-config/multi-display.inc
+++ /dev/null
@@ -1 +0,0 @@
-HAS_MULTI_DISPLAY ??= "1"
diff --git a/meta-agl-ic-container/recipes-platform/images/agl-cluster-demo-lxc-host.bb b/meta-agl-ic-container/recipes-platform/images/agl-cluster-demo-lxc-host.bb
deleted file mode 100644
index 03a49d33..00000000
--- a/meta-agl-ic-container/recipes-platform/images/agl-cluster-demo-lxc-host.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-SUMMARY = "LXC host demo image"
-LICENSE = "MIT"
-
-require lxc-host-image-minimal.bb
-require recipes-platform/images/agl-lxc-install-single-image.inc
-require recipes-platform/images/agl-lxc-autostart.inc
-
-CONTAINER_IMAGES ?= "agl-container-cluster:guest-image-cluster-demo \
- agl-container-ivi:guest-image-ivi-demo \
- "
-
-IMAGE_INSTALL += " \
- kernel-modules \
- alsa-utils \
- packagegroup-pipewire \
- pipewire-ic-ipc \
- wireplumber-config-agl \
-"
-
-# packages required for network bridge settings via lxc-net
-IMAGE_INSTALL += " \
- lxc-networking \
- iptables-modules \
- dnsmasq \
- systemd-netif-config \
- kernel-module-xt-addrtype \
- kernel-module-xt-multiport \
-"
-
-# network manager to use
-VIRTUAL-RUNTIME_net_manager = "systemd"
-
-
-# Under the this line, shall describe machine specific package.
-IMAGE_INSTALL:append:rcar-gen3 = " kernel-module-gles gles-user-module-firmware"
diff --git a/meta-agl-ic-container/recipes-platform/images/agl-lxc-autostart.inc b/meta-agl-ic-container/recipes-platform/images/agl-lxc-autostart.inc
deleted file mode 100644
index 41a925e3..00000000
--- a/meta-agl-ic-container/recipes-platform/images/agl-lxc-autostart.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-# Integration type support for lxc autostart based startup.
-
-IMAGE_INSTALL += " \
- ${LXC_CONTAINER_CONFIGS} \
- lxc-autostart \
-"
-
-LXC_CONTAINER_CONFIGS ?= ""
-
-python __anonymous() {
- for c in (d.getVar('CONTAINER_IMAGES') or "").split():
- (mc, image) = c.split(':')
-
- # Assume there is a X-lxc-config package for guest-image-X
- config = image
- if config.startswith('guest-image-'):
- config = config[len('guest-image-'):]
- d.appendVar('LXC_CONTAINER_CONFIGS', ' ' + 'lxc-config-' + config)
-}
diff --git a/meta-agl-ic-container/recipes-platform/images/agl-lxc-install-single-image.inc b/meta-agl-ic-container/recipes-platform/images/agl-lxc-install-single-image.inc
deleted file mode 100644
index 4f230298..00000000
--- a/meta-agl-ic-container/recipes-platform/images/agl-lxc-install-single-image.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-# Integration type support for install guest root filesystem into host image.
-
-require recipes-platform/images/agl-lxc-multiconfig-build.inc
-
-# Handle modification of IMAGE_LINK_NAME done by ULCB builds with Kingfisher support
-MACHINE_SUFFIX = "${@bb.utils.contains('AGL_FEATURES', 'kingfisher', '-kf', '', d)}"
-
-install_container_images() {
- for c in ${CONTAINER_IMAGES}; do
- config=${c%:*}
- image=${c#*:}
- name=${image#guest-image-}
- rm -rf ${IMAGE_ROOTFS}/var/lib/machines/${name}
- install -m 0755 -d ${IMAGE_ROOTFS}/var/lib/machines/${name}
- src="${TOPDIR}/tmp-${config}/deploy/images/${MACHINE}/${image}-${MACHINE}${MACHINE_SUFFIX}${IMAGE_NAME_SUFFIX}.tar.bz2"
- bbnote "Installing ${src}"
- tar -C ${IMAGE_ROOTFS}/var/lib/machines/${name} -xf ${src}
- done
-}
-
-ROOTFS_POSTPROCESS_COMMAND += "install_container_images; "