summaryrefslogtreecommitdiffstats
path: root/meta-agl-ic-container/recipes-platform/images
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/recipes-platform/images
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/recipes-platform/images')
-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
3 files changed, 0 insertions, 75 deletions
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; "