From 68cd2d51ab476701de4529d4cc831eda87c525d7 Mon Sep 17 00:00:00 2001
From: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
Date: Tue, 12 Nov 2024 01:08:33 +0900
Subject: [PATCH] Maintain container setting to update container-manager
After the scarthgap update, systemd cgroup-v1 and v2 mixed support
was disabled. It require to improve container-manager.
Container-manager has some improvement already.
This change maintain container setting to use these improvement.
Bug-AGL: SPEC-5284
Change-Id: Ic2f94cc33577c07755940bcdb4376dacbd9b0ade
Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
---
.../cm-config-agl-flutter-ivi-demo_1.0.bb | 1 +
.../cm-config-agl-momi-ivi-demo_1.0.bb | 1 +
.../cm-config-agl-qt-ivi-demo_1.0.bb | 1 +
.../cm-config-cluster-demo_1.0.bb | 1 +
.../recipes-kernel/linux/linux/lxc.cfg | 18 ++++++++----------
.../recipes-platform/images/guest-image-ivi-demo.bb | 2 +-
6 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo_1.0.bb b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo_1.0.bb
index c9563c11..07120eee 100644
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo_1.0.bb
+++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo_1.0.bb
@@ -12,6 +12,7 @@ do_install:append() {
install -Dm644 ${WORKDIR}/agl-flutter-ivi-demo.json ${D}/opt/container/conf/agl-flutter-ivi-demo.json
install -d ${D}/opt/container/guests/agl-flutter-ivi-demo/rootfs
install -d ${D}/opt/container/guests/agl-flutter-ivi-demo/nv
+ install -d ${D}/opt/container/guests/agl-flutter-ivi-demo/shmounts
}
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo_1.0.bb b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo_1.0.bb
index 682d6527..6b4ce42c 100644
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo_1.0.bb
+++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo_1.0.bb
@@ -12,6 +12,7 @@ do_install:append() {
install -Dm644 ${WORKDIR}/agl-momi-ivi-demo.json ${D}/opt/container/conf/agl-momi-ivi-demo.json
install -d ${D}/opt/container/guests/agl-momi-ivi-demo/rootfs
install -d ${D}/opt/container/guests/agl-momi-ivi-demo/nv
+ install -d ${D}/opt/container/guests/agl-momi-ivi-demo/shmounts
}
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo_1.0.bb b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo_1.0.bb
index 6752beaa..606e5759 100644
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo_1.0.bb
+++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo_1.0.bb
@@ -12,6 +12,7 @@ do_install:append() {
install -Dm644 ${WORKDIR}/agl-qt-ivi-demo.json ${D}/opt/container/conf/agl-qt-ivi-demo.json
install -d ${D}/opt/container/guests/agl-qt-ivi-demo/rootfs
install -d ${D}/opt/container/guests/agl-qt-ivi-demo/nv
+ install -d ${D}/opt/container/guests/agl-qt-ivi-demo/shmounts
}
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo_1.0.bb b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo_1.0.bb
index b5c2aea1..9bc43f6f 100644
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo_1.0.bb
+++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo_1.0.bb
@@ -13,6 +13,7 @@ do_install:append() {
install -Dm644 ${WORKDIR}/cluster-demo.json ${D}/opt/container/conf/cluster-demo.json
install -d ${D}/opt/container/guests/cluster-demo/rootfs
install -d ${D}/opt/container/guests/cluster-demo/nv
+ install -d ${D}/opt/container/guests/cluster-demo/shmounts
}
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-agl-ic-container/recipes-kernel/linux/linux/lxc.cfg b/meta-agl-ic-container/recipes-kernel/linux/linux/lxc.cfg
index fb87ea19..6fbf43f5 100644
--- a/meta-agl-ic-container/recipes-kernel/linux/linux/lxc.cfg
+++ b/meta-agl-ic-container/recipes-kernel/linux/linux/lxc.cfg
@@ -1,10 +1,14 @@
+CONFIG_BPF=y
CONFIG_CGROUP_DEVICE=y
CONFIG_CPUSETS=y
CONFIG_PROC_PID_CPUSET=y
CONFIG_MEMCG=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_BLK_CGROUP=y
+CONFIG_NET_CLS_CGROUP=y
+CONFIG_CGROUP_NET_PRIO=y
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
@@ -13,14 +17,8 @@ CONFIG_USER_NS=y
CONFIG_PID_NS=y
CONFIG_NET_NS=y
-CONFIG_NET_CLS_CGROUP=m
-CONFIG_BLK_CGROUP=y
-CONFIG_CGROUP_NET_PRIO=y
-
-# Virtual drivers
-CONFIG_HVC_DRIVER=y
-
-# Support for virtual ethernet and LXC
CONFIG_VETH=y
-CONFIG_MACVLAN=y
+CONFIG_MACVLAN=m
CONFIG_VXLAN=m
+
+CONFIG_VXCAN=y
diff --git a/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb b/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb
index c23748d0..aba7198d 100644
--- a/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb
+++ b/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb
@@ -27,4 +27,4 @@ IMAGE_INSTALL:append:rpi = " mesa-megadriver"
IMAGE_OVERHEAD_FACTOR = "0"
EXTRA_IMAGECMD:append = " -L agl-momi-ivi"
IMAGE_ROOTFS_EXTRA_SPACE = "0"
-IMAGE_ROOTFS_SIZE = "1048576"
+IMAGE_ROOTFS_SIZE = "2097152"
--
2.16.6