diff options
13 files changed, 39 insertions, 17 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-container/container-manager/container-manager/container-manager.service b/meta-agl-ic-container/recipes-container/container-manager/container-manager/container-manager.service index de532fd5..554cdb2f 100644 --- a/meta-agl-ic-container/recipes-container/container-manager/container-manager/container-manager.service +++ b/meta-agl-ic-container/recipes-container/container-manager/container-manager/container-manager.service @@ -6,6 +6,7 @@ Wants=drm-lease-manager.service lxc-net.service multi-user.target [Service] Type=notify ExecStart=/usr/bin/containermanager +Delegate=true [Install] WantedBy=multi-user.target diff --git a/meta-agl-ic-container/recipes-container/container-manager/container-manager_git.bb b/meta-agl-ic-container/recipes-container/container-manager/container-manager_git.bb index 41f75d4d..7a024125 100644 --- a/meta-agl-ic-container/recipes-container/container-manager/container-manager_git.bb +++ b/meta-agl-ic-container/recipes-container/container-manager/container-manager_git.bb @@ -15,7 +15,7 @@ SRC_URI = " \ file://container-manager.service \ file://container-manager.json \ " -SRCREV = "e516cfeca7859a74a47155ab77d4b1610cae6617" +SRCREV = "49a2bd8dc221125ac3b4859dab23a6870275c619" S = "${WORKDIR}/git" diff --git a/meta-agl-ic-container/recipes-core/systemd/systemd-timesyncd-guest/timesyncd-run-guest.conf b/meta-agl-ic-container/recipes-core/systemd/systemd-timesyncd-guest/timesyncd-run-guest.conf new file mode 100644 index 00000000..9a5cd624 --- /dev/null +++ b/meta-agl-ic-container/recipes-core/systemd/systemd-timesyncd-guest/timesyncd-run-guest.conf @@ -0,0 +1,2 @@ +[Unit] +ConditionVirtualization= diff --git a/meta-agl-ic-container/recipes-core/systemd/systemd-timesyncd-guest_1.0.bb b/meta-agl-ic-container/recipes-core/systemd/systemd-timesyncd-guest_1.0.bb new file mode 100644 index 00000000..e8ec6500 --- /dev/null +++ b/meta-agl-ic-container/recipes-core/systemd/systemd-timesyncd-guest_1.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "Container guest configuration for systemd-timesyncd." +DESCRIPTION = "Container guest configuration for systemd-timesyncd. \ + It enables systemd-timesyncd in container guest." +LICENSE = "MIT" +SRC_URI = " \ + file://timesyncd-run-guest.conf \ + " + +do_install() { + install -D -m644 ${WORKDIR}/timesyncd-run-guest.conf ${D}/${systemd_system_unitdir}/systemd-timesyncd.service.d/timesyncd-run-guest.conf +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +FILES:${PN} = "\ + ${systemd_system_unitdir}/systemd-timesyncd.service.d/* \ +" 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 f9dbabd6..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 @@ -10,7 +10,6 @@ IMAGE_INSTALL += " \ mominavi \ momiplay \ momiweather \ - chrony \ systemd-netif-config \ ttf-dejavu-sans \ ttf-dejavu-sans-mono \ @@ -28,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" diff --git a/meta-agl-ic-container/recipes-platform/images/guest-image-minimal.bb b/meta-agl-ic-container/recipes-platform/images/guest-image-minimal.bb index 8dcdb3fb..0a7eeb1e 100644 --- a/meta-agl-ic-container/recipes-platform/images/guest-image-minimal.bb +++ b/meta-agl-ic-container/recipes-platform/images/guest-image-minimal.bb @@ -6,6 +6,7 @@ IMAGE_ROOTFS_EXTRA_SPACE:append = "${@bb.utils.contains("DISTRO_FEATURES", "syst IMAGE_INSTALL += " \ packagegroup-agl-container-feature-logging-guest \ + ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager', 'systemd', 'systemd-timesyncd-guest', '', d)} \ " FEATURE_PACKAGES_selinux:remove = " \ diff --git a/meta-egvirt/conf/include/agl-egvirt.inc b/meta-egvirt/conf/include/agl-egvirt.inc index 1e3660ec..4373931f 100644 --- a/meta-egvirt/conf/include/agl-egvirt.inc +++ b/meta-egvirt/conf/include/agl-egvirt.inc @@ -1,7 +1,7 @@ REQUIRED_VERSION_libgpiod = "2.1" FEATURE_PACKAGES_virtio-loopback = " \ - kernel-module-virtio-loopback \ + virtio-loopback-driver \ virtio-can-driver \ virtio-loopback-adapter \ vhost-device-rng \ diff --git a/meta-egvirt/recipes-kernel/kernel-module-virtio-loopback/kernel-module-virtio-loopback.bb b/meta-egvirt/recipes-kernel/kernel-module-virtio-loopback/virtio-loopback-driver_git.bb index a7a13ffe..ba0f7e24 100644 --- a/meta-egvirt/recipes-kernel/kernel-module-virtio-loopback/kernel-module-virtio-loopback.bb +++ b/meta-egvirt/recipes-kernel/kernel-module-virtio-loopback/virtio-loopback-driver_git.bb @@ -10,7 +10,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/virtio/virtio-loopback-dr SRCREV = "8948c9808eded80772de98cd4e8dd0cc71fdbe17" S = "${WORKDIR}/git" +UNPACKDIR = "${S}" -MAKE_TARGETS = "-C ${STAGING_KERNEL_DIR} M=${WORKDIR}/git" -MODULES_INSTALL_TARGET = "-C ${STAGING_KERNEL_DIR} M=${WORKDIR}/git modules_install" - +MAKE_TARGETS = "-C ${STAGING_KERNEL_DIR} M=${S}" +MODULES_INSTALL_TARGET = "-C ${STAGING_KERNEL_DIR} M=${S} modules_install" |