Add recipe for default Qt environment variables

Move existing Qt environment variables from appcontroller conf
to a separate component. Appcontroller is configured to use the
same file, and it can also be used without appcontroller from
a systemd service to get working Qt environment.

Task-number: AUTOSUITE-1141
Change-Id: I588769a3bba036ab9f90e0292ab17e7d3f040f80
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

5 files changed, 5 insertions, 11 deletions

diff --git a/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller_git.bbappend b/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs.bbappend
index 708ed85e..55b6cc83 100644
--- a/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller_git.bbappend
+++ b/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -31,7 +31,10 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://kms.conf"
 
-FILES_${PN} += "${sysconfdir}/kms.conf"
+do_configure_append() {
+    echo "QT_QPA_EGLFS_KMS_CONFIG=/etc/kms.conf" >> ${WORKDIR}/defaults
+    echo "QSG_RENDER_LOOP=basic" >> ${WORKDIR}/defaults
+}
 
 do_install_append() {
     install -m 0644 ${WORKDIR}/kms.conf ${D}${sysconfdir}/
diff --git a/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/draak/kms.conf b/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs/draak/kms.conf
index 4cbbf498..4cbbf498 100644
--- a/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/draak/kms.conf
+++ b/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs/draak/kms.conf
diff --git a/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/ebisu/kms.conf b/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs/ebisu/kms.conf
index 4cbbf498..4cbbf498 100644
--- a/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/ebisu/kms.conf
+++ b/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs/ebisu/kms.conf
diff --git a/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/kms.conf b/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs/kms.conf
index db7a5032..db7a5032 100644
--- a/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/kms.conf
+++ b/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs/kms.conf
diff --git a/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/appcontroller.conf b/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/appcontroller.conf
deleted file mode 100644
index 60ee1f17..00000000
--- a/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/appcontroller.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
-env=QT_QPA_EGLFS_KMS_CONFIG=/etc/kms.conf
-env=QT_IM_MODULE=qtvirtualkeyboard
-env=QT_QPA_EGLFS_FORCE888=0
-env=QT_QUICK_CONTROLS_1_STYLE=Flat
-env=XDG_RUNTIME_DIR=/run/user/0
-env=QSG_RENDER_LOOP=basic
-env=QTWEBENGINE_DISABLE_SANDBOX=1
-base=linux