Start qtlauncher and emulatorproxy as last services

Task-number: QTBUG-64786
Done-with: Kalle Viironen <kalle.viironen@qt.io>
Change-Id: I83a89e6a4469657e7fb24156cd20f6e19dacdf6a
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

6 files changed, 33 insertions, 4 deletions

diff --git a/conf/machine/emulator.conf b/conf/machine/emulator.conf
index 21cd96d..2ab622e 100644
--- a/conf/machine/emulator.conf
+++ b/conf/machine/emulator.conf
@@ -48,3 +48,5 @@ MACHINE_FEATURES += "x86"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d virtualbox-guest-additions"
 
 MACHINE_FEATURES += "apm alsa pcmcia bluetooth irda usbgadget screen"
+
+SYSTEMD_DEFAULT_TARGET = "custom.target"
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher/emulator/b2qt.service b/recipes-qt/b2qt-addons/b2qt-launcher/emulator/b2qt.service
new file mode 100644
index 0000000..65fba92
--- /dev/null
+++ b/recipes-qt/b2qt-addons/b2qt-launcher/emulator/b2qt.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=B2Qt user application
+After=multi-user.target
+ConditionPathExists=/usr/bin/b2qt
+
+[Service]
+ExecStart=-/usr/bin/appcontroller /usr/bin/b2qt
+
+[Install]
+WantedBy=custom.target
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher/emulator/qtlauncher.service b/recipes-qt/b2qt-addons/b2qt-launcher/emulator/qtlauncher.service
new file mode 100644
index 0000000..2b02c87
--- /dev/null
+++ b/recipes-qt/b2qt-addons/b2qt-launcher/emulator/qtlauncher.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=B2Qt Launcher Demo
+After=multi-user.target
+
+ConditionPathExists=!/usr/bin/b2qt
+
+[Service]
+ExecStart=-/usr/bin/appcontroller /usr/bin/qtlauncher --applications-root /data/user/qt
+
+[Install]
+WantedBy=custom.target
diff --git a/recipes-qt/qt5-addons/qtsimulator/custom.target b/recipes-qt/qt5-addons/qtsimulator/custom.target
new file mode 100644
index 0000000..05b2268
--- /dev/null
+++ b/recipes-qt/qt5-addons/qtsimulator/custom.target
@@ -0,0 +1,5 @@
+[Unit]
+Description=Custom Target
+Requires=multi-user.target
+After=multi-user.target
+AllowIsolate=yes
diff --git a/recipes-qt/qt5-addons/qtsimulator/emulatorproxy.service b/recipes-qt/qt5-addons/qtsimulator/emulatorproxy.service
index 472433c..baf0296 100644
--- a/recipes-qt/qt5-addons/qtsimulator/emulatorproxy.service
+++ b/recipes-qt/qt5-addons/qtsimulator/emulatorproxy.service
@@ -1,7 +1,6 @@
 [Unit]
 Description=QtSimulator Proxy Daemon
-Wants=network-online.target
-After=network-online.target
+After=multi-user.target
 
 [Service]
 Type=forking
@@ -9,4 +8,4 @@ ExecStart=/usr/bin/emulatorproxyd
 EnvironmentFile=/etc/default/emulator
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=custom.target
diff --git a/recipes-qt/qt5-addons/qtsimulator_1.0.bb b/recipes-qt/qt5-addons/qtsimulator_1.0.bb
index 6810d06..c4c8d21 100644
--- a/recipes-qt/qt5-addons/qtsimulator_1.0.bb
+++ b/recipes-qt/qt5-addons/qtsimulator_1.0.bb
@@ -39,6 +39,7 @@ SRC_URI = " \
     file://emulatorproxy.service \
     file://emulator-hostname.sh \
     file://emulator \
+    file://custom.target \
     "
 
 SRCREV = "f98633ebee7dbce79c00fbfec86537c6330e2b5f"
@@ -56,6 +57,7 @@ do_install_append() {
 
     install -m 0755 -d ${D}${systemd_unitdir}/system
     install -m 0644 ${WORKDIR}/emulatorproxy.service ${D}${systemd_unitdir}/system/
+    install -m 0644 ${WORKDIR}/custom.target ${D}${systemd_unitdir}/system/
 
     install -m 0755 -d ${D}${sysconfdir}/profile.d
     install -m 0644 ${WORKDIR}/emulator-hostname.sh ${D}${sysconfdir}/profile.d/
@@ -67,6 +69,6 @@ do_install_append() {
 INITSCRIPT_NAME = "emulatorproxyd.sh"
 INITSCRIPT_PARAMS = "defaults 97 10"
 
-SYSTEMD_SERVICE_${PN} = "emulatorproxy.service"
+SYSTEMD_SERVICE_${PN} = "emulatorproxy.service custom.target"
 
 inherit update-rc.d systemd