diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-05-16 16:21:55 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-05-17 08:00:32 +0000 |
commit | 2ffdce5fb5a08147999ec0449346ad11f3cec0a4 (patch) | |
tree | 391fad1b8128f6495bb3c9ec0f01cb1dac2ec243 /recipes-qt | |
parent | 97e7ac812f392ae7665637a3a4b8fb54fb24e55c (diff) | |
download | meta-boot2qt-2ffdce5fb5a08147999ec0449346ad11f3cec0a4.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>
(cherry picked from commit 9c39345b8c202e29c2759774452ed8df8a84cc11)
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'recipes-qt')
9 files changed, 12 insertions, 10 deletions
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb index 9c52606..8e8d020 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb | |||
@@ -51,6 +51,8 @@ do_configure_append() { | |||
51 | do_install_append() { | 51 | do_install_append() { |
52 | install -m 0755 -d ${D}${sysconfdir} | 52 | install -m 0755 -d ${D}${sysconfdir} |
53 | install -m 0755 ${WORKDIR}/appcontroller.conf ${D}${sysconfdir}/ | 53 | install -m 0755 ${WORKDIR}/appcontroller.conf ${D}${sysconfdir}/ |
54 | } | ||
55 | 54 | ||
56 | FILES_${PN} += "${sysconfdir}/appcontroller.conf" | 55 | # loginctl enable-linger root |
56 | install -d ${D}/var/lib/systemd/linger | ||
57 | touch ${D}/var/lib/systemd/linger/root | ||
58 | } | ||
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf index 61818b8..f928069 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf | |||
@@ -2,5 +2,5 @@ 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 | base=linux | 6 | base=linux |
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf index db9fe89..d1d666a 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf | |||
@@ -4,5 +4,5 @@ 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 | base=linux | 8 | base=linux |
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf index 83f3876..914097a 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf | |||
@@ -4,5 +4,5 @@ env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins | |||
4 | env=QT_IM_MODULE=qtvirtualkeyboard | 4 | env=QT_IM_MODULE=qtvirtualkeyboard |
5 | env=QTGLESSTREAM_DISPLAY=192.168.56.1 | 5 | env=QTGLESSTREAM_DISPLAY=192.168.56.1 |
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 | base=linux | 8 | base=linux |
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf index 4608bfe..e70bdce 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf | |||
@@ -5,5 +5,5 @@ 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 | base=linux | 9 | base=linux |
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx7/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx7/appcontroller.conf index 71a4f4f..2847068 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx7/appcontroller.conf +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx7/appcontroller.conf | |||
@@ -4,5 +4,5 @@ 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 | base=linux | 8 | base=linux |
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf index aad2161..cb26f9e 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf | |||
@@ -2,5 +2,5 @@ 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 | base=linux | 6 | base=linux |
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf index 0b7ae16..c72abc1 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/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=QSG_RENDER_LOOP=basic | 6 | env=QSG_RENDER_LOOP=basic |
7 | base=linux | 7 | base=linux |
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/ti33x/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/ti33x/appcontroller.conf index 4935581..77b63f0 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/ti33x/appcontroller.conf +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/ti33x/appcontroller.conf | |||
@@ -3,5 +3,5 @@ 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 | base=linux | 7 | base=linux |