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 <dhobsong@igel.co.jp>

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 573f479..6545b1a 100644 (file)
--- 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 0bc7e11..05e3bab 100644 (file)
--- 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 (file)
index 0000000..9d1e4fd
--- /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 (file)
index 0000000..371f653
--- /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 (file)
index 0000000..3fb39ec
--- /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"]