From cf7a8c9527d04df829ed7bea3414bc9baeb04498 Mon Sep 17 00:00:00 2001 From: Damian Hobson-Garcia Date: Thu, 16 Feb 2023 11:35:27 -0500 Subject: ic-container: Add default configuration for qemu Define the defaults to launch the cluster and ivi containers on qemu. Platform specific customizations can be added in dynamic layers. Bug-AGL: SPEC-4464 Change-Id: I3d2bc4e3dfa8afdad4d29fc29700833f5bc7ecaa Signed-off-by: Damian Hobson-Garcia --- .../recipes-container/lxc-config/lxc-config-ivi-demo/network.in | 6 ++++-- .../recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bb | 4 +++- .../recipes-container/lxc-config/multi-display.inc | 1 + .../drm-lease-manager/drm-lease-manager-init.bbappend | 2 ++ .../drm-lease-manager/drm-lease-manager-init/drm-lease-manager.ini | 7 +++++++ 5 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 meta-agl-ic-container/recipes-container/lxc-config/multi-display.inc create mode 100644 meta-agl-ic-container/recipes-graphics/drm-lease-manager/drm-lease-manager-init.bbappend create mode 100644 meta-agl-ic-container/recipes-graphics/drm-lease-manager/drm-lease-manager-init/drm-lease-manager.ini (limited to 'meta-agl-ic-container') 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 index 573f4796..6545b1ad 100644 --- 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 @@ -1,3 +1,5 @@ # lxc network setting -lxc.net.0.type = empty - +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_1.0.bb b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bb index 0bc7e11c..05e3bab0 100644 --- 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 @@ -4,4 +4,6 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec inherit lxc-config -LXC_AUTO_START ??= "0" +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 new file mode 100644 index 00000000..9d1e4fdf --- /dev/null +++ b/meta-agl-ic-container/recipes-container/lxc-config/multi-display.inc @@ -0,0 +1 @@ +HAS_MULTI_DISPLAY ??= "1" diff --git a/meta-agl-ic-container/recipes-graphics/drm-lease-manager/drm-lease-manager-init.bbappend b/meta-agl-ic-container/recipes-graphics/drm-lease-manager/drm-lease-manager-init.bbappend new file mode 100644 index 00000000..371f6539 --- /dev/null +++ b/meta-agl-ic-container/recipes-graphics/drm-lease-manager/drm-lease-manager-init.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +SRC_URI = "file://drm-lease-manager.ini" diff --git a/meta-agl-ic-container/recipes-graphics/drm-lease-manager/drm-lease-manager-init/drm-lease-manager.ini b/meta-agl-ic-container/recipes-graphics/drm-lease-manager/drm-lease-manager-init/drm-lease-manager.ini new file mode 100644 index 00000000..3fb39ec7 --- /dev/null +++ b/meta-agl-ic-container/recipes-graphics/drm-lease-manager/drm-lease-manager-init/drm-lease-manager.ini @@ -0,0 +1,7 @@ +[[lease]] +name="lease-ivi" +connectors=["Virtual-1"] + +[[lease]] +name="lease-cluster" +connectors=["Virtual-2"] -- cgit 1.2.3-korg