Skip to content
Snippets Groups Projects
Commit 03320c1d authored by Tobias Kahlki's avatar Tobias Kahlki
Browse files

qt:compositor: Run the qt-compositor as qt user

Changed the qt-multi-screen-compositor to run under the qt username.
Fixed the file names of the systemd service units and
added the creation of the qt user to the recipe.
parent 5fc7107b
No related branches found
No related tags found
2 merge requests!418Integrate gitlab-ci/fix-gitlab-ci-integration and 6 more,!410qt:compositor: Fixed qt-compositor to run under Yocto Kirkstone
......@@ -5,9 +5,11 @@ Conflicts=plymouth-quit.service
After=systemd-user-sessions.service plymouth-quit-wait.service systemd-logind.service
[Service]
User=%i
PAMName=login
Environment=XDG_RUNTIME_DIR=/var/run/user/0
User=qt
Group=qt
WorkingDirectory=/home/qt
PAMName=qt-autologin
#Environment=XDG_RUNTIME_DIR=/var/run/user/0
Environment=QT_QPA_FONTDIR=/usr/share/fonts/truetype
Environment=QT_QPA_PLATFORM=linuxfb
Environment=QT_QUICK_BACKEND=software
......@@ -20,8 +22,6 @@ StandardError=journal
PermissionsStartOnly=true
IgnoreSIGPIPE=no
#Type=notify
#NotifyAccess=all
Type=simple
Type=notify
ExecStart=/usr/bin/multiscreen-compositor
......@@ -5,9 +5,11 @@ Conflicts=plymouth-quit.service
After=systemd-user-sessions.service plymouth-quit-wait.service systemd-logind.service
[Service]
User=%i
PAMName=login
Environment=XDG_RUNTIME_DIR=/var/run/user/0
User=qt
Group=qt
WorkingDirectory=/home/qt
PAMName=qt-autologin
#Environment=XDG_RUNTIME_DIR=/var/run/user/0
Environment=QT_QPA_FONTDIR=/usr/share/fonts/truetype
Environment=QT_QPA_PLATFORM=eglfs
......@@ -23,8 +25,6 @@ StandardError=journal
PermissionsStartOnly=true
IgnoreSIGPIPE=no
#Type=notify
#NotifyAccess=all
Type=simple
Type=notify
ExecStart=/usr/bin/multiscreen-compositor
......@@ -5,9 +5,11 @@ Conflicts=plymouth-quit.service
After=systemd-user-sessions.service plymouth-quit-wait.service systemd-logind.service
[Service]
User=%i
PAMName=login
Environment=XDG_RUNTIME_DIR=/var/run/user/0
User=qt
Group=qt
WorkingDirectory=/home/qt
PAMName=qt-autologin
#Environment=XDG_RUNTIME_DIR=/var/run/user/0
Environment=QT_QPA_FONTDIR=/usr/share/fonts/truetype
Environment=QT_QPA_PLATFORM=eglfs
......@@ -22,8 +24,6 @@ StandardError=journal
PermissionsStartOnly=true
IgnoreSIGPIPE=no
#Type=notify
#NotifyAccess=all
Type=simple
Type=notify
ExecStart=/usr/bin/multiscreen-compositor
SUMMARY = "Modified Qt multi-screen compositor example"
SUMMARY = "Qt multi-screen Compositor"
HOMEPAGE = "https://git.seco.com/seco-ne/tools/qt-multi-screen-compositor"
LICENSE = "BSD-3-Clause"
......@@ -8,11 +8,12 @@ DEPENDS = "qtbase qtquickcontrols"
RDEPENDS:${PN} += "qtwayland"
SRCREV = "${AUTOREV}"
SRC_URI = "git://git.seco.com/seco-ne/tools/qt-multi-screen-compositor.git;protocol=https;branch=master;nobranch=1 \
file://qt-multi-screen-compositor@.service \
SRC_URI = " \
git://git.seco.com/seco-ne/tools/qt-multi-screen-compositor.git;protocol=https;branch=master;nobranch=1 \
file://qt-multi-screen-compositor.service \
"
# Create a <tag>-<number of commits since tag>-<hash> Version string
inherit gitpkgv
PKGV = "${GITPKGVTAG}"
......@@ -25,7 +26,6 @@ require recipes-qt/qt5/qt5.inc
FILESEXTRAPATHS:prepend := "${THISDIR}:"
# ${PN}-tools added by qt5.inc, but we do not need it
PACKAGES:remove = "${PN}-tools"
QMAKE_PROFILES = "${S}/compositor.pro"
......@@ -37,24 +37,28 @@ do_install () {
install -m 0755 compositor-message/compositor-message ${D}${bindir}
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
#Systemd unit
# Systemd Unit
install -d ${D}${systemd_system_unitdir}/
install -D -p -m 0644 ${WORKDIR}/qt-multi-screen-compositor@.service ${D}${systemd_system_unitdir}/qt-multi-screen-compositor@.service
install -D -p -m 0644 ${WORKDIR}/qt-multi-screen-compositor@.service ${D}${systemd_system_unitdir}/qt-multi-screen-compositor.service
fi
}
SRC_URI:append:mx8m-generic-bsp = " \
SRC_URI:append:mx8m = " \
file://kms.conf \
"
do_install:append:mx8m-generic-bsp () {
do_install:append:mx8m () {
install -d ${D}${sysconfdir}/
install -m 0664 ${WORKDIR}/kms.conf ${D}${sysconfdir}/kms.conf
}
FILES:${PN} += " \
${systemd_system_unitdir}/qt-multi-screen-compositor@.service \
${systemd_system_unitdir}/qt-multi-screen-compositor.service \
"
SYSTEMD_SERVICE:${PN} = "qt-multi-screen-compositor@%i.service"
SYSTEMD_SERVICE:${PN} = "qt-multi-screen-compositor.service"
inherit useradd
USERADD_PACKAGES = "${PN}"
USERADD_PARAM:${PN} = "--home /home/qt --shell /bin/sh --user-group -G video,input qt"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment