From 663b86b82547d74154ca5890e39e6587b7b320d1 Mon Sep 17 00:00:00 2001 From: Sami Nurmenniemi Date: Wed, 29 Nov 2017 17:13:54 +0200 Subject: Start qtlauncher and emulatorproxy as last services Task-number: QTBUG-64786 Done-with: Kalle Viironen Change-Id: I83a89e6a4469657e7fb24156cd20f6e19dacdf6a Reviewed-by: Samuli Piippo --- recipes-qt/qt5-addons/qtsimulator/custom.target | 5 +++++ recipes-qt/qt5-addons/qtsimulator/emulatorproxy.service | 5 ++--- recipes-qt/qt5-addons/qtsimulator_1.0.bb | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 recipes-qt/qt5-addons/qtsimulator/custom.target (limited to 'recipes-qt/qt5-addons') 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 -- cgit v1.2.3-54-g00ecf