appcontroller: Use proper directory for XDG_RUNTIME_DIR

XDG_RUNTIME_DIR must be owned by the user, and Qt automatically
changes the access rights if the directory has something else.
Enable systemd's loginctl enable-linger for the default user 'root'
so that /run/user/0 is always available.

Task-number: QTBUG-68152
Change-Id: Ic45649210ddca54daddeb8dac44b41ec37e6a172
Reviewed-by: Karim Pinter <karim.pinter@qt.io>

11 files changed, 14 insertions, 12 deletions

diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/appcontroller.conf
index 1ef37328..3f06e3bd 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/appcontroller.conf
@@ -2,6 +2,6 @@ env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
 env=QT_IM_MODULE=qtvirtualkeyboard
 env=QT_QPA_EGLFS_FORCE888=0
 env=QT_QUICK_CONTROLS_1_STYLE=Flat
-env=XDG_RUNTIME_DIR=/tmp
+env=XDG_RUNTIME_DIR=/run/user/0
 env=QTWEBENGINE_DISABLE_SANDBOX=1
 base=linux
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/colibri-vf/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/colibri-vf/appcontroller.conf
index 4fa19318..d59ca371 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/colibri-vf/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/colibri-vf/appcontroller.conf
@@ -4,6 +4,6 @@ env=QSG_RENDER_LOOP=basic
 env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
 env=QT_IM_MODULE=qtvirtualkeyboard
 env=QT_QUICK_CONTROLS_1_STYLE=Flat
-env=XDG_RUNTIME_DIR=/tmp
+env=XDG_RUNTIME_DIR=/run/user/0
 env=QTWEBENGINE_DISABLE_SANDBOX=1
 base=linux
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/emulator/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/emulator/appcontroller.conf
index 2bc6ecab..e619fff9 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/emulator/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/emulator/appcontroller.conf
@@ -5,6 +5,6 @@ env=QT_IM_MODULE=qtvirtualkeyboard
 env=QTGLESSTREAM_DISPLAY=192.168.56.1
 env=SIMULATOR_HOSTNAME=192.168.56.1
 env=QT_QUICK_CONTROLS_1_STYLE=Flat
-env=XDG_RUNTIME_DIR=/tmp
+env=XDG_RUNTIME_DIR=/run/user/0
 env=QTWEBENGINE_DISABLE_SANDBOX=1
 base=linux
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx6/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx6/appcontroller.conf
index 4e3415f5..411ec02d 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx6/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx6/appcontroller.conf
@@ -5,6 +5,6 @@ env=QT_IM_MODULE=qtvirtualkeyboard
 env=QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS=/dev/input/event0
 env=QT_GSTREAMER_CAMERABIN_VIDEOSRC=mxc_v4l2=imxv4l2videosrc,v4l2src
 env=QT_QUICK_CONTROLS_1_STYLE=Flat
-env=XDG_RUNTIME_DIR=/tmp
+env=XDG_RUNTIME_DIR=/run/user/0
 env=QTWEBENGINE_DISABLE_SANDBOX=1
 base=linux
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx7/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx7/appcontroller.conf
index b27315e7..38d06e69 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx7/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx7/appcontroller.conf
@@ -4,6 +4,6 @@ env=QT_QPA_PLATFORM=linuxfb
 env=QSG_RENDER_LOOP=basic
 env=QT_IM_MODULE=qtvirtualkeyboard
 env=QT_QUICK_CONTROLS_1_STYLE=Flat
-env=XDG_RUNTIME_DIR=/tmp
+env=XDG_RUNTIME_DIR=/run/user/0
 env=QTWEBENGINE_DISABLE_SANDBOX=1
 base=linux
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/rpi/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/rpi/appcontroller.conf
index 09153436..f129589a 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/rpi/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/rpi/appcontroller.conf
@@ -2,6 +2,6 @@ env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
 env=QT_IM_MODULE=qtvirtualkeyboard
 env=QT_QPA_EGLFS_FORCE888=1
 env=QT_QUICK_CONTROLS_1_STYLE=Flat
-env=XDG_RUNTIME_DIR=/tmp
+env=XDG_RUNTIME_DIR=/run/user/0
 env=QTWEBENGINE_DISABLE_SANDBOX=1
 base=linux
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/tegra-t18x/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/tegra-t18x/appcontroller.conf
index 21bb44cd..85227c24 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/tegra-t18x/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/tegra-t18x/appcontroller.conf
@@ -2,7 +2,7 @@ env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
 env=QT_IM_MODULE=qtvirtualkeyboard
 env=QT_QPA_EGLFS_FORCE888=0
 env=QT_QUICK_CONTROLS_1_STYLE=Flat
-env=XDG_RUNTIME_DIR=/tmp
+env=XDG_RUNTIME_DIR=/run/user/0
 env=QSG_RENDER_LOOP=basic
 env=QTWEBENGINE_DISABLE_SANDBOX=1
 base=linux
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/ti33x/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/ti33x/appcontroller.conf
index 37284def..76313a87 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/ti33x/appcontroller.conf
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/ti33x/appcontroller.conf
@@ -3,6 +3,6 @@ env=QT_IM_MODULE=qtvirtualkeyboard
 env=QT_QPA_EGLFS_FORCE888=0
 env=QT_QUICK_CONTROLS_1_STYLE=Flat
 env=QT_QPA_EGLFS_INTEGRATION=none
-env=XDG_RUNTIME_DIR=/tmp
+env=XDG_RUNTIME_DIR=/run/user/0
 env=QTWEBENGINE_DISABLE_SANDBOX=1
 base=linux
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb
index 82f02be3..d1f87221 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb
@@ -50,6 +50,8 @@ do_configure_append() {
 do_install_append() {
     install -m 0755 -d ${D}${sysconfdir}
     install -m 0755 ${WORKDIR}/appcontroller.conf ${D}${sysconfdir}/
-}
 
-FILES_${PN} += "${sysconfdir}/appcontroller.conf"
+    # loginctl enable-linger root
+    install -d ${D}/var/lib/systemd/linger
+    touch ${D}/var/lib/systemd/linger/root
+}
diff --git a/meta-intel-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf b/meta-intel-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf
index ca5f455a..3487042b 100644
--- a/meta-intel-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf
+++ b/meta-intel-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf
@@ -3,5 +3,5 @@ env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
 env=QT_IM_MODULE=qtvirtualkeyboard
 env=QT_QPA_EGLFS_FORCE888=0
 env=QT_QUICK_CONTROLS_1_STYLE=Flat
-env=XDG_RUNTIME_DIR=/tmp
+env=XDG_RUNTIME_DIR=/run/user/0
 base=linux
diff --git a/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf b/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf
index 2b4919df..c71c409e 100644
--- a/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf
+++ b/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf
@@ -3,6 +3,6 @@ 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=/tmp
+env=XDG_RUNTIME_DIR=/run/user/0
 env=QSG_RENDER_LOOP=basic
 base=linux