diff options
Diffstat (limited to 'meta-agl-ic-container')
94 files changed, 875 insertions, 499 deletions
diff --git a/meta-agl-ic-container/SECURITY.md b/meta-agl-ic-container/SECURITY.md new file mode 100644 index 00000000..a3c80fdd --- /dev/null +++ b/meta-agl-ic-container/SECURITY.md @@ -0,0 +1,19 @@ +How to Report a Potential Vulnerability? +======================================== + +If you would like to report a public issue (for example, one with a released +CVE number), please report it to security AT automotivelinux DOT org + +If you are dealing with a not-yet released or urgent issue, please send a +message to security AT automotivelinux DOT org, including as many details as +possible: the layer or software module affected, the recipe and its version, +and any example code, if available. + +Branches maintained with security fixes +--------------------------------------- + +See [https://wiki.automotivelinux.org/schedule this page] +for detailed info regarding the policies and maintenance of Stable branches. + +The [https://wiki.automotivelinux.org/agl-distro/release-notes Release page] +contains a list of all releases of Automotive Grade Linux. 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/dynamic-layers/meta-rockchip/recipes-platform/images/agl-host-image-drm-lease-test.bbappend b/meta-agl-ic-container/dynamic-layers/meta-rockchip/recipes-platform/images/agl-host-image-drm-lease-test.bbappend new file mode 100644 index 00000000..138ee521 --- /dev/null +++ b/meta-agl-ic-container/dynamic-layers/meta-rockchip/recipes-platform/images/agl-host-image-drm-lease-test.bbappend @@ -0,0 +1,5 @@ +IMAGE_INSTALL:append = " \ + linux-firmware-rtl8822 \ + linux-firmware-rtl8125 \ + rockchip-libmali-firmware \ +" diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/nanopct6/agl-flutter-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/nanopct6/agl-flutter-ivi-demo.json index 3066c4da..2b67c107 100644 --- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/nanopct6/agl-flutter-ivi-demo.json +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/nanopct6/agl-flutter-ivi-demo.json @@ -30,9 +30,14 @@ }, "resource": [ { - "type": "cgroup", + "type": "cgroupv2", "object": "cpuset.cpus", - "value": "0-6" + "value": "1-7" + }, + { + "type": "cgroupv2", + "object": "memory.max", + "value": "8G" }, { "type": "prlimit", @@ -123,6 +128,15 @@ "optional": 0, "wideallow": 0, "exclusive": 0 + }, + { + "type": "devnode", + "from": "/dev/mpp_service", + "to": "dev/mpp_service", + "devnode": "/dev/mpp_service", + "optional": 1, + "wideallow": 1, + "exclusive": 0 } ], "dynamic": [ diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/rcar-gen3/agl-flutter-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/rcar-gen3/agl-flutter-ivi-demo.json index 78a03ef8..f8799738 100644 --- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/rcar-gen3/agl-flutter-ivi-demo.json +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/rcar-gen3/agl-flutter-ivi-demo.json @@ -26,6 +26,18 @@ "HOME=/home/root" ] }, + "resource": [ + { + "type": "cgroupv2", + "object": "cpuset.cpus", + "value": "1-7" + }, + { + "type": "prlimit", + "object": "rtprio", + "value": "50" + } + ], "fs": { "mount": [ { 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/nanopct6/agl-momi-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/nanopct6/agl-momi-ivi-demo.json index 25caed4a..bea3cb34 100644 --- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/nanopct6/agl-momi-ivi-demo.json +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/nanopct6/agl-momi-ivi-demo.json @@ -29,9 +29,14 @@ }, "resource": [ { - "type": "cgroup", + "type": "cgroupv2", "object": "cpuset.cpus", - "value": "0-6" + "value": "1-7" + }, + { + "type": "cgroupv2", + "object": "memory.max", + "value": "8G" }, { "type": "prlimit", @@ -122,6 +127,15 @@ "optional": 0, "wideallow": 0, "exclusive": 0 + }, + { + "type": "devnode", + "from": "/dev/mpp_service", + "to": "dev/mpp_service", + "devnode": "/dev/mpp_service", + "optional": 1, + "wideallow": 1, + "exclusive": 0 } ], "dynamic": [ diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/rcar-gen3/agl-momi-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/rcar-gen3/agl-momi-ivi-demo.json index 97f3c3d1..f48664d4 100644 --- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/rcar-gen3/agl-momi-ivi-demo.json +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/rcar-gen3/agl-momi-ivi-demo.json @@ -27,6 +27,18 @@ "HOME=/home/root" ] }, + "resource": [ + { + "type": "cgroupv2", + "object": "cpuset.cpus", + "value": "1-7" + }, + { + "type": "prlimit", + "object": "rtprio", + "value": "50" + } + ], "fs": { "mount": [ { 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/nanopct6/agl-qt-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/nanopct6/agl-qt-ivi-demo.json index b74170ef..0e7521c4 100644 --- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/nanopct6/agl-qt-ivi-demo.json +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/nanopct6/agl-qt-ivi-demo.json @@ -31,9 +31,14 @@ }, "resource": [ { - "type": "cgroup", + "type": "cgroupv2", "object": "cpuset.cpus", - "value": "0-6" + "value": "1-7" + }, + { + "type": "cgroupv2", + "object": "memory.max", + "value": "8G" }, { "type": "prlimit", @@ -124,6 +129,15 @@ "optional": 0, "wideallow": 0, "exclusive": 0 + }, + { + "type": "devnode", + "from": "/dev/mpp_service", + "to": "dev/mpp_service", + "devnode": "/dev/mpp_service", + "optional": 1, + "wideallow": 1, + "exclusive": 0 } ], "dynamic": [ diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/rcar-gen3/agl-qt-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/rcar-gen3/agl-qt-ivi-demo.json index ccbf66b6..bf01e0e2 100644 --- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/rcar-gen3/agl-qt-ivi-demo.json +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/rcar-gen3/agl-qt-ivi-demo.json @@ -27,6 +27,18 @@ "HOME=/home/root" ] }, + "resource": [ + { + "type": "cgroupv2", + "object": "cpuset.cpus", + "value": "1-7" + }, + { + "type": "prlimit", + "object": "rtprio", + "value": "50" + } + ], "fs": { "mount": [ { 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/nanopct6/cluster-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/nanopct6/cluster-demo.json index 90a9b0a8..7058f5a5 100644 --- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/nanopct6/cluster-demo.json +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/nanopct6/cluster-demo.json @@ -28,7 +28,7 @@ }, "resource": [ { - "type": "cgroup", + "type": "cgroupv2", "object": "cpuset.cpus", "value": "0" }, diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/rcar-gen3/cluster-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/rcar-gen3/cluster-demo.json index c0bff97b..2aa0dcf3 100644 --- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/rcar-gen3/cluster-demo.json +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/rcar-gen3/cluster-demo.json @@ -26,6 +26,18 @@ "HOME=/home/root" ] }, + "resource": [ + { + "type": "cgroupv2", + "object": "cpuset.cpus", + "value": "0" + }, + { + "type": "prlimit", + "object": "rtprio", + "value": "50" + } + ], "fs": { "mount": [ { 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-config/cm-config-drm-lease-test-cluster/drm-lease-test-cluster.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-drm-lease-test-cluster/drm-lease-test-cluster.json new file mode 100644 index 00000000..fc173b86 --- /dev/null +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-drm-lease-test-cluster/drm-lease-test-cluster.json @@ -0,0 +1,3 @@ +{ + "name": "cluster-demo" +} diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-drm-lease-test-cluster/nanopct6/drm-lease-test-cluster.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-drm-lease-test-cluster/nanopct6/drm-lease-test-cluster.json new file mode 100644 index 00000000..c8f7e8da --- /dev/null +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-drm-lease-test-cluster/nanopct6/drm-lease-test-cluster.json @@ -0,0 +1,95 @@ +{ + "name": "drm-lease-test-cluster", + "role": "cluster", + "base": { + "autoboot": true, + "bootpriority": 1, + "rootfs": { + "path": "/opt/container/guests/drm-lease-test-cluster/rootfs", + "mode": "rw", + "hostpath": [ + "/var/lib/machines/guest1" + ] + }, + "lifecycle": { + "halt": "SIGRTMIN+3", + "reboot": "SIGTERM", + "timeout": 5000 + }, + "cap": { + "drop": "sys_module mac_admin mac_override sys_time", + "keep": "" + }, + "environment": [ + "HOME=/home/root" + ] + }, + "fs": { + "mount": [ + { + "type": "filesystem", + "from": "tmpfs", + "to": "run", + "fstype": "tmpfs", + "option": "defaults 0 0" + }, + { + "type": "directory", + "from": "/sys/kernel/security", + "to": "sys/kernel/security", + "fstype": "none", + "option": "ro,bind,optional 0 0" + }, + { + "type": "directory", + "from": "/run/drm-lease-manager/lease-cluster", + "to": "var/display/drm-lease-manager/lease", + "fstype": "none", + "option": "bind,create=file" + }, + { + "type": "directory", + "from": "/run/dlt", + "to": "run/dlt", + "fstype": "none", + "option": "bind,optional,create=dir" + } + ] + }, + "device": { + "static": [ + { + "type": "devdir", + "from": "/dev/dri", + "to": "dev/dri", + "devnode": "/dev/dri/card0", + "optional": 0, + "wideallow": 1, + "exclusive": 0 + }, + { + "type": "devnode", + "from": "/dev/mali0", + "to": "dev/mali0", + "devnode": "/dev/mali0", + "optional": 0, + "wideallow": 0, + "exclusive": 0 + } + ] + }, + "network": { + "static": [ + { + "type": "veth", + "param": { + "name": "veth0", + "link": "lxcbr0", + "flags": "up", + "hwaddr": "00:16:3e:xx:xx:xx", + "mode": "bridge" + } + } + ] + } +} diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-drm-lease-test-cluster/qemux86-64/drm-lease-test-cluster.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-drm-lease-test-cluster/qemux86-64/drm-lease-test-cluster.json new file mode 100644 index 00000000..47161e1f --- /dev/null +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-drm-lease-test-cluster/qemux86-64/drm-lease-test-cluster.json @@ -0,0 +1,86 @@ +{ + "name": "drm-lease-test-cluster", + "role": "cluster", + "base": { + "autoboot": true, + "bootpriority": 1, + "rootfs": { + "path": "/opt/container/guests/drm-lease-test-cluster/rootfs", + "mode": "rw", + "hostpath": [ + "/var/lib/machines/guest1" + ] + }, + "lifecycle": { + "halt": "SIGRTMIN+3", + "reboot": "SIGTERM", + "timeout": 5000 + }, + "cap": { + "drop": "sys_module mac_admin mac_override sys_time", + "keep": "" + }, + "environment": [ + "HOME=/home/root" + ] + }, + "fs": { + "mount": [ + { + "type": "filesystem", + "from": "tmpfs", + "to": "run", + "fstype": "tmpfs", + "option": "defaults 0 0" + }, + { + "type": "directory", + "from": "/sys/kernel/security", + "to": "sys/kernel/security", + "fstype": "none", + "option": "ro,bind,optional 0 0" + }, + { + "type": "directory", + "from": "/run/drm-lease-manager/lease-cluster", + "to": "var/display/drm-lease-manager/lease", + "fstype": "none", + "option": "bind,create=file" + }, + { + "type": "directory", + "from": "/run/dlt", + "to": "run/dlt", + "fstype": "none", + "option": "bind,optional,create=dir" + } + ] + }, + "device": { + "static": [ + { + "type": "devdir", + "from": "/dev/dri", + "to": "dev/dri", + "devnode": "/dev/dri/card0", + "optional": 0, + "wideallow": 1, + "exclusive": 0 + } + ] + }, + "network": { + "static": [ + { + "type": "veth", + "param": { + "name": "veth0", + "link": "lxcbr0", + "flags": "up", + "hwaddr": "00:16:3e:xx:xx:xx", + "mode": "bridge" + } + } + ] + } +} 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/container-manager-config/cm-config-drm-lease-test-cluster/system.conf.drm-lease-test-cluster.in index f496c589..f496c589 100644 --- 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/container-manager-config/cm-config-drm-lease-test-cluster/system.conf.drm-lease-test-cluster.in diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-drm-lease-test-cluster_1.0.bb b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-drm-lease-test-cluster_1.0.bb new file mode 100644 index 00000000..80a794fe --- /dev/null +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-drm-lease-test-cluster_1.0.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Container Manager config for drm lease test cluster" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" + + +SRC_URI = "file://drm-lease-test-cluster.json \ + file://system.conf.drm-lease-test-cluster.in \ + " + +inherit cm-config + +do_install:append() { + install -Dm644 ${WORKDIR}/drm-lease-test-cluster.json ${D}/opt/container/conf/drm-lease-test-cluster.json + install -d ${D}/opt/container/guests/drm-lease-test-cluster/rootfs + install -d ${D}/opt/container/guests/drm-lease-test-cluster/nv + install -d ${D}/opt/container/guests/drm-lease-test-cluster/shmounts +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +FILES:${PN} += " \ + /opt/container/conf/* \ + /opt/container/guests/drm-lease-test-cluster/* \ + " + diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-drm-lease-test-ivi/drm-lease-test-ivi.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-drm-lease-test-ivi/drm-lease-test-ivi.json new file mode 100644 index 00000000..b9828b6f --- /dev/null +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-drm-lease-test-ivi/drm-lease-test-ivi.json @@ -0,0 +1,3 @@ +{ + "name": "agl-momi-ivi-demo" +} diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-drm-lease-test-ivi/nanopct6/drm-lease-test-ivi.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-drm-lease-test-ivi/nanopct6/drm-lease-test-ivi.json new file mode 100644 index 00000000..cc0748bf --- /dev/null +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-drm-lease-test-ivi/nanopct6/drm-lease-test-ivi.json @@ -0,0 +1,121 @@ +{ + "name": "drm-lease-test-ivi", + "role": "ivi", + "base": { + "autoboot": true, + "bootpriority": 10, + "rootfs": { + "path": "/opt/container/guests/drm-lease-test-ivi/rootfs", + "mode": "rw", + "hostpath": [ + "/var/lib/machines/guest2" + ] + }, + "lifecycle": { + "halt": "SIGRTMIN+3", + "reboot": "SIGTERM", + "timeout": 15000 + }, + "cap": { + "drop": "sys_module mac_admin mac_override", + "keep": "" + }, + "environment": [ + "PIPEWIRE_RUNTIME_DIR=/var", + "HOME=/home/root" + ] + }, + "fs": { + "mount": [ + { + "type": "filesystem", + "from": "tmpfs", + "to": "run", + "fstype": "tmpfs", + "option": "defaults 0 0" + }, + { + "type": "directory", + "from": "/sys/kernel/security", + "to": "sys/kernel/security", + "fstype": "none", + "option": "ro,bind,optional 0 0" + }, + { + "type": "directory", + "from": "/run/udev/data", + "to": "run/udev/data", + "fstype": "none", + "option": "ro,bind,optional,create=dir" + }, + { + "type": "directory", + "from": "/run/drm-lease-manager/lease-ivi", + "to": "var/display/drm-lease-manager/lease", + "fstype": "none", + "option": "bind,create=file" + }, + { + "type": "directory", + "from": "/run/dlt", + "to": "run/dlt", + "fstype": "none", + "option": "bind,optional,create=dir" + } + ] + }, + "device": { + "static": [ + { + "type": "devdir", + "from": "/dev/dri", + "to": "dev/dri", + "devnode": "/dev/dri/card0", + "optional": 0, + "wideallow": 1, + "exclusive": 0 + }, + { + "type": "devdir", + "from": "/dev/input", + "to": "dev/input", + "devnode": "/dev/input/event0", + "optional": 1, + "wideallow": 1, + "exclusive": 0 + }, + { + "type": "devdir", + "from": "/dev/snd", + "to": "dev/snd", + "devnode": "/dev/snd/controlC0", + "optional": 1, + "wideallow": 1, + "exclusive": 0 + }, + { + "type": "devnode", + "from": "/dev/mali0", + "to": "dev/mali0", + "devnode": "/dev/mali0", + "optional": 0, + "wideallow": 0, + "exclusive": 0 + } + ] + }, + "network": { + "static": [ + { + "type": "veth", + "param": { + "name": "eth0", + "link": "lxcbr0", + "flags": "up", + "hwaddr": "00:16:3e:xx:xx:xx", + "mode": "bridge" + } + } + ] + } +} diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-drm-lease-test-ivi/qemux86-64/drm-lease-test-ivi.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-drm-lease-test-ivi/qemux86-64/drm-lease-test-ivi.json new file mode 100644 index 00000000..631816bd --- /dev/null +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-drm-lease-test-ivi/qemux86-64/drm-lease-test-ivi.json @@ -0,0 +1,103 @@ +{ + "name": "drm-lease-test-ivi", + "role": "ivi", + "base": { + "autoboot": true, + "bootpriority": 10, + "rootfs": { + "path": "/opt/container/guests/drm-lease-test-ivi/rootfs", + "mode": "rw", + "hostpath": [ + "/var/lib/machines/guest2" + ] + }, + "lifecycle": { + "halt": "SIGRTMIN+3", + "reboot": "SIGTERM", + "timeout": 15000 + }, + "cap": { + "drop": "sys_module mac_admin mac_override", + "keep": "" + }, + "environment": [ + "PIPEWIRE_RUNTIME_DIR=/var", + "HOME=/home/root" + ] + }, + "fs": { + "mount": [ + { + "type": "filesystem", + "from": "tmpfs", + "to": "run", + "fstype": "tmpfs", + "option": "defaults 0 0" + }, + { + "type": "directory", + "from": "/sys/kernel/security", + "to": "sys/kernel/security", + "fstype": "none", + "option": "ro,bind,optional 0 0" + }, + { + "type": "directory", + "from": "/run/udev/data", + "to": "run/udev/data", + "fstype": "none", + "option": "ro,bind,optional,create=dir" + }, + { + "type": "directory", + "from": "/run/drm-lease-manager/lease-ivi", + "to": "var/display/drm-lease-manager/lease", + "fstype": "none", + "option": "bind,create=file" + }, + { + "type": "directory", + "from": "/run/dlt", + "to": "run/dlt", + "fstype": "none", + "option": "bind,optional,create=dir" + } + ] + }, + "device": { + "static": [ + { + "type": "devdir", + "from": "/dev/dri", + "to": "dev/dri", + "devnode": "/dev/dri/card0", + "optional": 0, + "wideallow": 1, + "exclusive": 0 + }, + { + "type": "devdir", + "from": "/dev/input", + "to": "dev/input", + "devnode": "/dev/input/event0", + "optional": 1, + "wideallow": 1, + "exclusive": 0 + } + ] + }, + "network": { + "static": [ + { + "type": "veth", + "param": { + "name": "eth0", + "link": "lxcbr0", + "flags": "up", + "hwaddr": "00:16:3e:xx:xx:xx", + "mode": "bridge" + } + } + ] + } +} 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/container-manager-config/cm-config-drm-lease-test-ivi/system.conf.drm-lease-test-ivi.in index f496c589..f496c589 100644 --- 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/container-manager-config/cm-config-drm-lease-test-ivi/system.conf.drm-lease-test-ivi.in diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-drm-lease-test-ivi_1.0.bb b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-drm-lease-test-ivi_1.0.bb new file mode 100644 index 00000000..9d2d62f5 --- /dev/null +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-drm-lease-test-ivi_1.0.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Container Manager config for drm lease test ivi" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" + +SRC_URI = "file://drm-lease-test-ivi.json \ + file://system.conf.drm-lease-test-ivi.in \ + " + +inherit cm-config + +do_install:append() { + install -Dm644 ${WORKDIR}/drm-lease-test-ivi.json ${D}/opt/container/conf/drm-lease-test-ivi.json + install -d ${D}/opt/container/guests/drm-lease-test-ivi/rootfs + install -d ${D}/opt/container/guests/drm-lease-test-ivi/nv + install -d ${D}/opt/container/guests/drm-lease-test-ivi/shmounts +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +FILES:${PN} += " \ + /opt/container/conf/* \ + /opt/container/guests/drm-lease-test-ivi/* \ + " 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..0e6bfe07 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 = "665d8985e07688e8e8ec9dbaec63acd3ccd2d715" S = "${WORKDIR}/git" 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_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_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-core/systemd/systemd-netif-config_0.1.bb b/meta-agl-ic-container/recipes-core/systemd/systemd-netif-config_0.1.bb index 4024c278..2f6abe46 100644 --- a/meta-agl-ic-container/recipes-core/systemd/systemd-netif-config_0.1.bb +++ b/meta-agl-ic-container/recipes-core/systemd/systemd-netif-config_0.1.bb @@ -2,7 +2,7 @@ SUMMARY = "Systemd network interface configuration" DESCRIPTION = "Systemd network interface configuration \ " LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRC_URI = " \ file://20-wired.network \ 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..0a9b7470 --- /dev/null +++ b/meta-agl-ic-container/recipes-core/systemd/systemd-timesyncd-guest_1.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "Container guest configuration for systemd-timesyncd." +DESCRIPTION = "Container guest configuration for systemd-timesyncd. \ + It enables systemd-timesyncd in container guest." +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +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-demo/momikey/momikey_0.1.bb b/meta-agl-ic-container/recipes-demo/momikey/momikey_0.1.bb index 845ef46d..aa37c84a 100644 --- a/meta-agl-ic-container/recipes-demo/momikey/momikey_0.1.bb +++ b/meta-agl-ic-container/recipes-demo/momikey/momikey_0.1.bb @@ -2,7 +2,7 @@ SUMMARY = "CH57x keyboard based UI for container demo" DESCRIPTION = "Container exchange user interface using CH57x keyboard. \ This UI based on mock container manager for AGL CES2023 demo." LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRC_URI += " \ file://momikey.sh \ diff --git a/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-drm-lease-test.bb b/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-drm-lease-test.bb new file mode 100644 index 00000000..15b44ed2 --- /dev/null +++ b/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-drm-lease-test.bb @@ -0,0 +1,43 @@ +SUMMARY = "Configuration files for the Weston compositors for DRM lease testing" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRC_URI = " \ + file://weston.ini.ivi \ + file://weston.ini.cluster \ +" + +S = "${WORKDIR}" + +inherit allarch update-alternatives + +# On-target weston.ini directory +weston_ini_dir = "${sysconfdir}/xdg/weston" + +do_install() { + install -d ${D}${weston_ini_dir} + install -m 0644 ${WORKDIR}/weston.ini.ivi ${D}${weston_ini_dir}/ + install -m 0644 ${WORKDIR}/weston.ini.cluster ${D}${weston_ini_dir}/ +} + +ALTERNATIVE_LINK_NAME[weston.ini] = "${weston_ini_dir}/weston.ini" + +RDEPENDS:${PN} = "${BPN}-ivi" +ALLOW_EMPTY:${PN} = "1" + +PACKAGE_BEFORE_PN += "${PN}-ivi" + +FILES:${PN}-ivi = "${weston_ini_dir}/weston.ini.ivi" + +RPROVIDES:${PN}-ivi = "weston-ini" +ALTERNATIVE:${PN}-ivi = "weston.ini" +ALTERNATIVE_TARGET_${PN}-ivi = "${weston_ini_dir}/weston.ini.ivi" + +PACKAGE_BEFORE_PN += "${PN}-cluster" + +FILES:${PN}-cluster = "${weston_ini_dir}/weston.ini.cluster" + +RPROVIDES:${PN}-cluster = "weston-ini" +RCONFLICTS:${PN}-cluster = "${PN}-ivi" +ALTERNATIVE:${PN}-cluster = "weston.ini" +ALTERNATIVE_TARGET_${PN}-cluster = "${weston_ini_dir}/weston.ini.cluster" diff --git a/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-drm-lease-test/weston.ini.cluster b/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-drm-lease-test/weston.ini.cluster new file mode 100644 index 00000000..13347577 --- /dev/null +++ b/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-drm-lease-test/weston.ini.cluster @@ -0,0 +1,26 @@ +[core] +backend=drm-backend.so +require-input=false +idle-time=0 +modules=systemd-notify.so + +[shell] +locking=false +panel-position=none +background-color=0xff00ff00 + +[output] +name=Virtual-1 +mode=1920x1080 + +[output] +name=Virtual-2 +mode=1920x1080 + +[output] +name=HDMI-A-1 +mode=1920x1080 + +[output] +name=HDMI-A-2 +mode=1920x1080 diff --git a/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-drm-lease-test/weston.ini.ivi b/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-drm-lease-test/weston.ini.ivi new file mode 100644 index 00000000..24d4ee29 --- /dev/null +++ b/meta-agl-ic-container/recipes-graphics/wayland/weston-ini-conf-drm-lease-test/weston.ini.ivi @@ -0,0 +1,26 @@ +[core] +backend=drm-backend.so +require-input=false +idle-time=0 +modules=systemd-notify.so + +[shell] +locking=false +panel-position=none +background-color=0xffff0000 + +[output] +name=Virtual-1 +mode=1920x1080 + +[output] +name=Virtual-2 +mode=1920x1080 + +[output] +name=HDMI-A-1 +mode=1920x1080 + +[output] +name=HDMI-A-2 +mode=1920x1080 diff --git a/meta-agl-ic-container/recipes-graphics/wayland/weston-init-guest/weston.env b/meta-agl-ic-container/recipes-graphics/wayland/weston-init-guest/weston.env new file mode 100644 index 00000000..7df25aa2 --- /dev/null +++ b/meta-agl-ic-container/recipes-graphics/wayland/weston-init-guest/weston.env @@ -0,0 +1,6 @@ +XDG_RUNTIME_DIR=/run/user/0 +DLM_RUNTIME_PATH=/var/display/drm-lease-manager +DRM_LEASE_DEVICE=lease +WAYLAND_DISPLAY=wayland-1 +LIBSEAT_BACKEND=builtin +SEATD_VTBOUND=0 diff --git a/meta-agl-ic-container/recipes-graphics/wayland/weston-init-guest/weston.service b/meta-agl-ic-container/recipes-graphics/wayland/weston-init-guest/weston.service new file mode 100644 index 00000000..94a2a530 --- /dev/null +++ b/meta-agl-ic-container/recipes-graphics/wayland/weston-init-guest/weston.service @@ -0,0 +1,21 @@ +[Unit] +Description=Weston Wayland Compositor +RequiresMountsFor=/run +After=multi-user.target +Wants=multi-user.target + +[Service] +User=root +PAMName=login +EnvironmentFile=-/etc/default/weston +StandardError=journal +PermissionsStartOnly=true +IgnoreSIGPIPE=no +Type=notify +Restart=on-failure +StartLimitInterval=0 + +ExecStart=/usr/bin/weston --config /etc/xdg/weston/weston.ini --idle-time=0 --drm-lease=${DRM_LEASE_DEVICE} --log=/var/log/weston.log + +[Install] +WantedBy=multi-user.target diff --git a/meta-agl-ic-container/recipes-graphics/wayland/weston-init-guest_0.1.bb b/meta-agl-ic-container/recipes-graphics/wayland/weston-init-guest_0.1.bb new file mode 100644 index 00000000..d444317b --- /dev/null +++ b/meta-agl-ic-container/recipes-graphics/wayland/weston-init-guest_0.1.bb @@ -0,0 +1,46 @@ +SUMMARY = "Startup script and systemd unit file for the Weston Wayland compositor in guest cotainer" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRC_URI = "file://weston.env \ + file://weston.service \ + " + +S = "${WORKDIR}" + +inherit features_check systemd + +do_install() { + install -Dm644 ${WORKDIR}/weston.env ${D}${sysconfdir}/default/weston + + # Install Weston systemd service and accompanying udev rule + install -D -p -m0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}/weston.service + sed -i -e s:/etc:${sysconfdir}:g \ + -e s:/usr/bin:${bindir}:g \ + -e s:/var:${localstatedir}:g \ + ${D}${systemd_unitdir}/system/weston.service +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +# rdepends on weston-init-guest which depends on wayland +REQUIRED_DISTRO_FEATURES = "wayland" + +FILES:${PN} += " \ + ${sysconfdir}/xdg/weston/weston.ini \ + ${systemd_system_unitdir}/weston.service \ + ${sysconfdir}/default/weston \ + " +CONFFILES:${PN} += " \ + ${sysconfdir}/xdg/weston/weston.ini \ + ${sysconfdir}/default/weston \ + " +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "weston.service" +SYSTEMD_AUTO_ENABLE = "enable" + +RDEPENDS:${PN} = " \ + weston \ + weston-ini \ + " +RCONFLICTS:${PN} = "weston-init" 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/drm-lease-test/image-mount-drm-lease-test-cluster/drm-lease-test-cluster.mount b/meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-cluster/drm-lease-test-cluster.mount new file mode 100644 index 00000000..8415cd8c --- /dev/null +++ b/meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-cluster/drm-lease-test-cluster.mount @@ -0,0 +1,11 @@ +[Unit] +Description=Image mount for drl-lease-test-cluster + +[Mount] +What=/var/lib/machines/guest-image-drm-lease-test-cluster.ext4 +Where=/var/lib/machines/guest1 +Type=ext4 +Options=rw + +[Install] +WantedBy=local-fs.target diff --git a/meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-cluster_1.0.bb b/meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-cluster_1.0.bb new file mode 100644 index 00000000..7ab01743 --- /dev/null +++ b/meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-cluster_1.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "AGL CI guest image mounter for drm-lease-test-cluster." +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRC_URI += " \ + file://drm-lease-test-cluster.mount \ +" + +inherit systemd + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "var-lib-machines-guest1.mount" +SYSTEMD_AUTO_ENABLE:${PN} = "enable" + +do_install:append () { + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/drm-lease-test-cluster.mount ${D}${systemd_system_unitdir}/var-lib-machines-guest1.mount + install -d ${D}/var/lib/machines/guest1 +} + +FILES:${PN} += " \ + ${systemd_system_unitdir} \ + /var/lib/machines/* \ +" diff --git a/meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-ivi/drm-lease-test-ivi.mount b/meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-ivi/drm-lease-test-ivi.mount new file mode 100644 index 00000000..252dc61c --- /dev/null +++ b/meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-ivi/drm-lease-test-ivi.mount @@ -0,0 +1,11 @@ +[Unit] +Description=Image mount for drl-lease-test-cluster + +[Mount] +What=/var/lib/machines/guest-image-drm-lease-test-ivi.ext4 +Where=/var/lib/machines/guest2 +Type=ext4 +Options=rw + +[Install] +WantedBy=local-fs.target diff --git a/meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-ivi_1.0.bb b/meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-ivi_1.0.bb new file mode 100644 index 00000000..2c0607f0 --- /dev/null +++ b/meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-ivi_1.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "AGL CI guest image mounter for drm-lease-test-ivi." +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRC_URI += " \ + file://drm-lease-test-ivi.mount \ +" + +inherit systemd + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "var-lib-machines-guest2.mount" +SYSTEMD_AUTO_ENABLE:${PN} = "enable" + +do_install:append () { + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/drm-lease-test-ivi.mount ${D}${systemd_system_unitdir}/var-lib-machines-guest2.mount + install -d ${D}/var/lib/machines/guest2 +} + +FILES:${PN} += " \ + ${systemd_system_unitdir} \ + /var/lib/machines/* \ +" 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-host-image-drm-lease-test.bb b/meta-agl-ic-container/recipes-platform/images/agl-host-image-drm-lease-test.bb index 09b6ddac..5b751c0c 100644 --- a/meta-agl-ic-container/recipes-platform/images/agl-host-image-drm-lease-test.bb +++ b/meta-agl-ic-container/recipes-platform/images/agl-host-image-drm-lease-test.bb @@ -2,8 +2,7 @@ SUMMARY = "DRM Lease LXC test host 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 +require recipes-platform/images/agl-lxc-multiconfig-build.inc CONTAINER_IMAGES ?= "agl-container-ivi:guest-image-drm-lease-test-ivi \ agl-container-cluster:guest-image-drm-lease-test-cluster \ @@ -15,6 +14,9 @@ IMAGE_INSTALL += " \ # packages required for network bridge settings via lxc-net IMAGE_INSTALL += " \ + container-manager \ + cm-config-drm-lease-test-cluster image-mount-drm-lease-test-cluster \ + cm-config-drm-lease-test-ivi image-mount-drm-lease-test-ivi \ lxc-networking \ iptables-modules \ dnsmasq \ @@ -23,5 +25,19 @@ IMAGE_INSTALL += " \ kernel-module-xt-multiport \ " +install_container_images() { + for c in ${CONTAINER_IMAGES}; do + config=${c%:*} + image=${c#*:} + name=${image#guest-image-} + src="${TOPDIR}/tmp-${config}/deploy/images/${MACHINE}/${image}-${MACHINE}${MACHINE_SUFFIX}${IMAGE_NAME_SUFFIX}.ext4" + bbnote "Installing ${src}" + install -Dm644 ${src} ${IMAGE_ROOTFS}/var/lib/machines/${image}.ext4 + done +} + +ROOTFS_POSTPROCESS_COMMAND += "install_container_images; " + + # 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; " 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 = " \ |