diff options
5 files changed, 9 insertions, 0 deletions
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 | |||
3 | env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins | 3 | env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins |
4 | env=QT_IM_MODULE=qtvirtualkeyboard | 4 | env=QT_IM_MODULE=qtvirtualkeyboard |
5 | env=QTGLESSTREAM_DISPLAY=192.168.56.1 | 5 | env=QTGLESSTREAM_DISPLAY=192.168.56.1 |
6 | env=SIMULATOR_HOSTNAME=192.168.56.1 | ||
6 | env=QT_QUICK_CONTROLS_1_STYLE=Flat | 7 | env=QT_QUICK_CONTROLS_1_STYLE=Flat |
7 | env=XDG_RUNTIME_DIR=/tmp | 8 | env=XDG_RUNTIME_DIR=/tmp |
8 | base=linux | 9 | 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 | |||
5 | [Service] | 5 | [Service] |
6 | Type=forking | 6 | Type=forking |
7 | ExecStart=/usr/bin/emulatorproxyd | 7 | ExecStart=/usr/bin/emulatorproxyd |
8 | EnvironmentFile=/etc/default/emulator | ||
8 | 9 | ||
9 | [Install] | 10 | [Install] |
10 | WantedBy=multi-user.target | 11 | 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 = " \ | |||
37 | git://codereview.qt-project.org/tqtc-boot2qt/qtsimulator;branch=${BRANCH};protocol=ssh \ | 37 | git://codereview.qt-project.org/tqtc-boot2qt/qtsimulator;branch=${BRANCH};protocol=ssh \ |
38 | file://emulatorproxyd.sh \ | 38 | file://emulatorproxyd.sh \ |
39 | file://emulatorproxy.service \ | 39 | file://emulatorproxy.service \ |
40 | file://emulator-hostname \ | ||
41 | file://emulator \ | ||
40 | " | 42 | " |
41 | 43 | ||
42 | SRCREV = "f98633ebee7dbce79c00fbfec86537c6330e2b5f" | 44 | SRCREV = "f98633ebee7dbce79c00fbfec86537c6330e2b5f" |
@@ -54,6 +56,9 @@ do_install_append() { | |||
54 | 56 | ||
55 | install -m 0755 -d ${D}${systemd_unitdir}/system | 57 | install -m 0755 -d ${D}${systemd_unitdir}/system |
56 | install -m 0644 ${WORKDIR}/emulatorproxy.service ${D}${systemd_unitdir}/system/ | 58 | install -m 0644 ${WORKDIR}/emulatorproxy.service ${D}${systemd_unitdir}/system/ |
59 | |||
60 | install -m 0644 ${WORKDIR}/emulator-hostname.sh ${D}${sysconfdir}/profile.d/ | ||
61 | install -m 0644 ${WORKDIR}/emulator ${D}${sysconfdir}/default/ | ||
57 | } | 62 | } |
58 | 63 | ||
59 | INITSCRIPT_NAME = "emulatorproxyd.sh" | 64 | INITSCRIPT_NAME = "emulatorproxyd.sh" |