diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-05-16 16:21:55 +0300 |
---|---|---|
committer | Karim Pinter <karim.pinter@qt.io> | 2018-05-17 06:14:38 +0000 |
commit | 9c39345b8c202e29c2759774452ed8df8a84cc11 (patch) | |
tree | 939b89863e7017720329d34bad0d0e3ac21f5efa | |
parent | 21682eedfc974410b0cb8efdb7a4b9e4b7821cf9 (diff) | |
download | meta-boot2qt-9c39345b8c202e29c2759774452ed8df8a84cc11.tar.gz |
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 1ef3732..3f06e3b 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 | |||
2 | env=QT_IM_MODULE=qtvirtualkeyboard | 2 | env=QT_IM_MODULE=qtvirtualkeyboard |
3 | env=QT_QPA_EGLFS_FORCE888=0 | 3 | env=QT_QPA_EGLFS_FORCE888=0 |
4 | env=QT_QUICK_CONTROLS_1_STYLE=Flat | 4 | env=QT_QUICK_CONTROLS_1_STYLE=Flat |
5 | env=XDG_RUNTIME_DIR=/tmp | 5 | env=XDG_RUNTIME_DIR=/run/user/0 |
6 | env=QTWEBENGINE_DISABLE_SANDBOX=1 | 6 | env=QTWEBENGINE_DISABLE_SANDBOX=1 |
7 | base=linux | 7 | 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 4fa1931..d59ca37 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 | |||
4 | env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins | 4 | env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins |
5 | env=QT_IM_MODULE=qtvirtualkeyboard | 5 | env=QT_IM_MODULE=qtvirtualkeyboard |
6 | env=QT_QUICK_CONTROLS_1_STYLE=Flat | 6 | env=QT_QUICK_CONTROLS_1_STYLE=Flat |
7 | env=XDG_RUNTIME_DIR=/tmp | 7 | env=XDG_RUNTIME_DIR=/run/user/0 |
8 | env=QTWEBENGINE_DISABLE_SANDBOX=1 | 8 | env=QTWEBENGINE_DISABLE_SANDBOX=1 |
9 | base=linux | 9 | 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 2bc6eca..e619fff 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 | |||
5 | env=QTGLESSTREAM_DISPLAY=192.168.56.1 | 5 | env=QTGLESSTREAM_DISPLAY=192.168.56.1 |
6 | env=SIMULATOR_HOSTNAME=192.168.56.1 | 6 | env=SIMULATOR_HOSTNAME=192.168.56.1 |
7 | env=QT_QUICK_CONTROLS_1_STYLE=Flat | 7 | env=QT_QUICK_CONTROLS_1_STYLE=Flat |
8 | env=XDG_RUNTIME_DIR=/tmp | 8 | env=XDG_RUNTIME_DIR=/run/user/0 |
9 | env=QTWEBENGINE_DISABLE_SANDBOX=1 | 9 | env=QTWEBENGINE_DISABLE_SANDBOX=1 |
10 | base=linux | 10 | 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 4e3415f..411ec02 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 | |||
5 | env=QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS=/dev/input/event0 | 5 | env=QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS=/dev/input/event0 |
6 | env=QT_GSTREAMER_CAMERABIN_VIDEOSRC=mxc_v4l2=imxv4l2videosrc,v4l2src | 6 | env=QT_GSTREAMER_CAMERABIN_VIDEOSRC=mxc_v4l2=imxv4l2videosrc,v4l2src |
7 | env=QT_QUICK_CONTROLS_1_STYLE=Flat | 7 | env=QT_QUICK_CONTROLS_1_STYLE=Flat |
8 | env=XDG_RUNTIME_DIR=/tmp | 8 | env=XDG_RUNTIME_DIR=/run/user/0 |
9 | env=QTWEBENGINE_DISABLE_SANDBOX=1 | 9 | env=QTWEBENGINE_DISABLE_SANDBOX=1 |
10 | base=linux | 10 | 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 b27315e..38d06e6 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 | |||
4 | env=QSG_RENDER_LOOP=basic | 4 | env=QSG_RENDER_LOOP=basic |
5 | env=QT_IM_MODULE=qtvirtualkeyboard | 5 | env=QT_IM_MODULE=qtvirtualkeyboard |
6 | env=QT_QUICK_CONTROLS_1_STYLE=Flat | 6 | env=QT_QUICK_CONTROLS_1_STYLE=Flat |
7 | env=XDG_RUNTIME_DIR=/tmp | 7 | env=XDG_RUNTIME_DIR=/run/user/0 |
8 | env=QTWEBENGINE_DISABLE_SANDBOX=1 | 8 | env=QTWEBENGINE_DISABLE_SANDBOX=1 |
9 | base=linux | 9 | 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 0915343..f129589 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 | |||
2 | env=QT_IM_MODULE=qtvirtualkeyboard | 2 | env=QT_IM_MODULE=qtvirtualkeyboard |
3 | env=QT_QPA_EGLFS_FORCE888=1 | 3 | env=QT_QPA_EGLFS_FORCE888=1 |
4 | env=QT_QUICK_CONTROLS_1_STYLE=Flat | 4 | env=QT_QUICK_CONTROLS_1_STYLE=Flat |
5 | env=XDG_RUNTIME_DIR=/tmp | 5 | env=XDG_RUNTIME_DIR=/run/user/0 |
6 | env=QTWEBENGINE_DISABLE_SANDBOX=1 | 6 | env=QTWEBENGINE_DISABLE_SANDBOX=1 |
7 | base=linux | 7 | 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 21bb44c..85227c2 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 | |||
2 | env=QT_IM_MODULE=qtvirtualkeyboard | 2 | env=QT_IM_MODULE=qtvirtualkeyboard |
3 | env=QT_QPA_EGLFS_FORCE888=0 | 3 | env=QT_QPA_EGLFS_FORCE888=0 |
4 | env=QT_QUICK_CONTROLS_1_STYLE=Flat | 4 | env=QT_QUICK_CONTROLS_1_STYLE=Flat |
5 | env=XDG_RUNTIME_DIR=/tmp | 5 | env=XDG_RUNTIME_DIR=/run/user/0 |
6 | env=QSG_RENDER_LOOP=basic | 6 | env=QSG_RENDER_LOOP=basic |
7 | env=QTWEBENGINE_DISABLE_SANDBOX=1 | 7 | env=QTWEBENGINE_DISABLE_SANDBOX=1 |
8 | base=linux | 8 | 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 37284de..76313a8 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 | |||
3 | env=QT_QPA_EGLFS_FORCE888=0 | 3 | env=QT_QPA_EGLFS_FORCE888=0 |
4 | env=QT_QUICK_CONTROLS_1_STYLE=Flat | 4 | env=QT_QUICK_CONTROLS_1_STYLE=Flat |
5 | env=QT_QPA_EGLFS_INTEGRATION=none | 5 | env=QT_QPA_EGLFS_INTEGRATION=none |
6 | env=XDG_RUNTIME_DIR=/tmp | 6 | env=XDG_RUNTIME_DIR=/run/user/0 |
7 | env=QTWEBENGINE_DISABLE_SANDBOX=1 | 7 | env=QTWEBENGINE_DISABLE_SANDBOX=1 |
8 | base=linux | 8 | 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 82f02be..d1f8722 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() { | |||
50 | do_install_append() { | 50 | do_install_append() { |
51 | install -m 0755 -d ${D}${sysconfdir} | 51 | install -m 0755 -d ${D}${sysconfdir} |
52 | install -m 0755 ${WORKDIR}/appcontroller.conf ${D}${sysconfdir}/ | 52 | install -m 0755 ${WORKDIR}/appcontroller.conf ${D}${sysconfdir}/ |
53 | } | ||
54 | 53 | ||
55 | FILES_${PN} += "${sysconfdir}/appcontroller.conf" | 54 | # loginctl enable-linger root |
55 | install -d ${D}/var/lib/systemd/linger | ||
56 | touch ${D}/var/lib/systemd/linger/root | ||
57 | } | ||
diff --git a/meta-intel-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf b/meta-intel-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf index ca5f455..3487042 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 | |||
3 | env=QT_IM_MODULE=qtvirtualkeyboard | 3 | env=QT_IM_MODULE=qtvirtualkeyboard |
4 | env=QT_QPA_EGLFS_FORCE888=0 | 4 | env=QT_QPA_EGLFS_FORCE888=0 |
5 | env=QT_QUICK_CONTROLS_1_STYLE=Flat | 5 | env=QT_QUICK_CONTROLS_1_STYLE=Flat |
6 | env=XDG_RUNTIME_DIR=/tmp | 6 | env=XDG_RUNTIME_DIR=/run/user/0 |
7 | base=linux | 7 | 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 2b4919d..c71c409 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 | |||
3 | env=QT_IM_MODULE=qtvirtualkeyboard | 3 | env=QT_IM_MODULE=qtvirtualkeyboard |
4 | env=QT_QPA_EGLFS_FORCE888=0 | 4 | env=QT_QPA_EGLFS_FORCE888=0 |
5 | env=QT_QUICK_CONTROLS_1_STYLE=Flat | 5 | env=QT_QUICK_CONTROLS_1_STYLE=Flat |
6 | env=XDG_RUNTIME_DIR=/tmp | 6 | env=XDG_RUNTIME_DIR=/run/user/0 |
7 | env=QSG_RENDER_LOOP=basic | 7 | env=QSG_RENDER_LOOP=basic |
8 | base=linux | 8 | base=linux |