Skip to content
Snippets Groups Projects
Commit e7916d32 authored by Jonas Höppner's avatar Jonas Höppner
Browse files

multiscreen-compositor: Adapt receipe to adapted naming, add message client

Also convert recipe's syntax to kirkstone

(cherry picked from commit 98409477)
(cherry picked from commit 325cd3c2)
parent f80c2721
No related branches found
No related tags found
2 merge requests!418Integrate gitlab-ci/fix-gitlab-ci-integration and 6 more,!396Pull changes from dunfell branch
......@@ -24,4 +24,4 @@ IgnoreSIGPIPE=no
#NotifyAccess=all
Type=simple
ExecStart=/usr/bin/multi-screen
ExecStart=/usr/bin/multiscreen-compositor
......@@ -27,4 +27,4 @@ IgnoreSIGPIPE=no
#NotifyAccess=all
Type=simple
ExecStart=/usr/bin/multi-screen
ExecStart=/usr/bin/multiscreen-compositor
......@@ -26,4 +26,4 @@ IgnoreSIGPIPE=no
#NotifyAccess=all
Type=simple
ExecStart=/usr/bin/multi-screen
ExecStart=/usr/bin/multiscreen-compositor
......@@ -5,7 +5,7 @@ LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
DEPENDS = "qtbase qtquickcontrols"
RDEPENDS_${PN} += "qtwayland"
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 \
......@@ -23,17 +23,18 @@ inherit systemd
require recipes-qt/qt5/qt5.inc
FILESEXTRAPATHS_prepend := "${THISDIR}:"
FILESEXTRAPATHS:prepend := "${THISDIR}:"
# ${PN}-tools added by qt5.inc, but we do not need it
PACKAGES_remove = "${PN}-tools"
PACKAGES:remove = "${PN}-tools"
QMAKE_PROFILES = "${S}/multi-screen.pro"
QMAKE_PROFILES = "${S}/compositor.pro"
do_install () {
#Application
install -d ${D}${bindir}
install -m 0755 multi-screen ${D}${bindir}
install -m 0755 multiscreen-compositor/multiscreen-compositor ${D}${bindir}
install -m 0755 compositor-message/compositor-message ${D}${bindir}
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
#Systemd unit
......@@ -42,18 +43,18 @@ do_install () {
fi
}
SRC_URI_append_mx8m = " \
SRC_URI:append_mx8m = " \
file://kms.conf \
"
do_install_append_mx8m () {
do_install:append_mx8m () {
install -d ${D}${sysconfdir}/
install -m 0664 ${WORKDIR}/kms.conf ${D}${sysconfdir}/kms.conf
}
FILES_${PN} += " \
FILES:${PN} += " \
${systemd_system_unitdir}/qt-multi-screen-compositor@.service \
"
SYSTEMD_SERVICE_${PN} = "qt-multi-screen-compositor@%i.service"
SYSTEMD_SERVICE:${PN} = "qt-multi-screen-compositor@%i.service"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment