From 222a39db1e3aa21b3bd519ccdf8f25ce2814919e Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Tue, 14 Nov 2017 15:09:26 +0100 Subject: emulator: Set host IP as environment variable This does not rely on UDP network traffic anymore. Change-Id: I90bfb5c8a8081ae1797a21b2a752e0b95466b936 Reviewed-by: Samuli Piippo --- .../b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf | 1 + recipes-qt/qt5-addons/qtsimulator/emulator | 1 + recipes-qt/qt5-addons/qtsimulator/emulator-hostname.sh | 1 + recipes-qt/qt5-addons/qtsimulator/emulatorproxy.service | 1 + recipes-qt/qt5-addons/qtsimulator_1.0.bb | 5 +++++ 5 files changed, 9 insertions(+) create mode 100644 recipes-qt/qt5-addons/qtsimulator/emulator create mode 100644 recipes-qt/qt5-addons/qtsimulator/emulator-hostname.sh diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf index 83f3876..c9a10b6 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf @@ -3,6 +3,7 @@ env=QT_QPA_EGLFS_HIDECURSOR=1 env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins env=QT_IM_MODULE=qtvirtualkeyboard env=QTGLESSTREAM_DISPLAY=192.168.56.1 +env=SIMULATOR_HOSTNAME=192.168.56.1 env=QT_QUICK_CONTROLS_1_STYLE=Flat env=XDG_RUNTIME_DIR=/tmp base=linux diff --git a/recipes-qt/qt5-addons/qtsimulator/emulator b/recipes-qt/qt5-addons/qtsimulator/emulator new file mode 100644 index 0000000..aa4a718 --- /dev/null +++ b/recipes-qt/qt5-addons/qtsimulator/emulator @@ -0,0 +1 @@ +SIMULATOR_HOSTNAME=192.168.56.1 diff --git a/recipes-qt/qt5-addons/qtsimulator/emulator-hostname.sh b/recipes-qt/qt5-addons/qtsimulator/emulator-hostname.sh new file mode 100644 index 0000000..c1a6954 --- /dev/null +++ b/recipes-qt/qt5-addons/qtsimulator/emulator-hostname.sh @@ -0,0 +1 @@ +export SIMULATOR_HOSTNAME=192.168.56.1 diff --git a/recipes-qt/qt5-addons/qtsimulator/emulatorproxy.service b/recipes-qt/qt5-addons/qtsimulator/emulatorproxy.service index 7a709fd..2deb091 100644 --- a/recipes-qt/qt5-addons/qtsimulator/emulatorproxy.service +++ b/recipes-qt/qt5-addons/qtsimulator/emulatorproxy.service @@ -5,6 +5,7 @@ After=systemd-user-sessions.service [Service] Type=forking ExecStart=/usr/bin/emulatorproxyd +EnvironmentFile=/etc/default/emulator [Install] WantedBy=multi-user.target diff --git a/recipes-qt/qt5-addons/qtsimulator_1.0.bb b/recipes-qt/qt5-addons/qtsimulator_1.0.bb index e0cf2a6..bf96d26 100644 --- a/recipes-qt/qt5-addons/qtsimulator_1.0.bb +++ b/recipes-qt/qt5-addons/qtsimulator_1.0.bb @@ -37,6 +37,8 @@ SRC_URI = " \ git://codereview.qt-project.org/tqtc-boot2qt/qtsimulator;branch=${BRANCH};protocol=ssh \ file://emulatorproxyd.sh \ file://emulatorproxy.service \ + file://emulator-hostname \ + file://emulator \ " SRCREV = "f98633ebee7dbce79c00fbfec86537c6330e2b5f" @@ -54,6 +56,9 @@ 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}/emulator-hostname.sh ${D}${sysconfdir}/profile.d/ + install -m 0644 ${WORKDIR}/emulator ${D}${sysconfdir}/default/ } INITSCRIPT_NAME = "emulatorproxyd.sh" -- cgit v1.2.3-54-g00ecf