diff options
author | Rainer Keller <Rainer.Keller@qt.io> | 2017-07-21 11:19:57 +0200 |
---|---|---|
committer | Rainer Keller <Rainer.Keller@qt.io> | 2017-07-31 06:28:17 +0000 |
commit | 91de3846bf1a8208af8c66212f34a17d10e5ab27 (patch) | |
tree | 6aa1d1b5750a89d92299867529a6a30108890c41 | |
parent | 73eb59bfb7c8b9e5bc5c3b986a626dc43292f912 (diff) | |
download | meta-boot2qt-91de3846bf1a8208af8c66212f34a17d10e5ab27.tar.gz |
emulator: Remove emulator-sdcardmountd
It is now integrated in the proxy daemon
Change-Id: If15d3f341778c8c366c41a5e350367d0e55130ed
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
3 files changed, 0 insertions, 121 deletions
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb deleted file mode 100644 index b9acd13..0000000 --- a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | ############################################################################ | ||
2 | ## | ||
3 | ## Copyright (C) 2016 The Qt Company Ltd. | ||
4 | ## Contact: https://www.qt.io/licensing/ | ||
5 | ## | ||
6 | ## This file is part of the Boot to Qt meta layer. | ||
7 | ## | ||
8 | ## $QT_BEGIN_LICENSE:GPL$ | ||
9 | ## Commercial License Usage | ||
10 | ## Licensees holding valid commercial Qt licenses may use this file in | ||
11 | ## accordance with the commercial license agreement provided with the | ||
12 | ## Software or, alternatively, in accordance with the terms contained in | ||
13 | ## a written agreement between you and The Qt Company. For licensing terms | ||
14 | ## and conditions see https://www.qt.io/terms-conditions. For further | ||
15 | ## information use the contact form at https://www.qt.io/contact-us. | ||
16 | ## | ||
17 | ## GNU General Public License Usage | ||
18 | ## Alternatively, this file may be used under the terms of the GNU | ||
19 | ## General Public License version 3 or (at your option) any later version | ||
20 | ## approved by the KDE Free Qt Foundation. The licenses are as published by | ||
21 | ## the Free Software Foundation and appearing in the file LICENSE.GPL3 | ||
22 | ## included in the packaging of this file. Please review the following | ||
23 | ## information to ensure the GNU General Public License requirements will | ||
24 | ## be met: https://www.gnu.org/licenses/gpl-3.0.html. | ||
25 | ## | ||
26 | ## $QT_END_LICENSE$ | ||
27 | ## | ||
28 | ############################################################################ | ||
29 | |||
30 | DESCRIPTION = "SD-Card mount daemon for Emulator" | ||
31 | LICENSE = "The-Qt-Company-DCLA-2.1" | ||
32 | LIC_FILES_CHKSUM = "file://sdcardmountd.h;md5=709ec9e3c40137fa6068a903c57acdc1;beginline=1;endline=17" | ||
33 | |||
34 | inherit qmake5 | ||
35 | |||
36 | SRC_URI = " \ | ||
37 | git://codereview.qt-project.org/tqtc-boot2qt/emulator;branch=${BRANCH};protocol=ssh \ | ||
38 | file://sdcardmountd.sh \ | ||
39 | file://sdcardmount.service \ | ||
40 | " | ||
41 | |||
42 | SRCREV = "ab4a9f13831f44f3dcd375fa17ed7e102647febe" | ||
43 | BRANCH = "master" | ||
44 | PV = "1.0+git${SRCPV}" | ||
45 | |||
46 | S = "${WORKDIR}/git/src/helperlibs/sdcarddaemon" | ||
47 | |||
48 | DEPENDS = "qtbase qtsimulator" | ||
49 | |||
50 | do_install_append() { | ||
51 | install -m 0755 -d ${D}${sysconfdir}/init.d | ||
52 | install -m 0755 ${WORKDIR}/sdcardmountd.sh ${D}${sysconfdir}/init.d/ | ||
53 | |||
54 | install -m 0755 -d ${D}${systemd_unitdir}/system | ||
55 | install -m 0644 ${WORKDIR}/sdcardmount.service ${D}${systemd_unitdir}/system/ | ||
56 | } | ||
57 | |||
58 | INITSCRIPT_NAME = "sdcardmountd.sh" | ||
59 | INITSCRIPT_PARAMS = "defaults 97 10" | ||
60 | |||
61 | SYSTEMD_SERVICE_${PN} = "sdcardmount.service" | ||
62 | |||
63 | inherit update-rc.d systemd | ||
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd/sdcardmount.service b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd/sdcardmount.service deleted file mode 100644 index 1171089..0000000 --- a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd/sdcardmount.service +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | [Unit] | ||
2 | Description=QtSimulator SD Card Mount Daemon | ||
3 | After=systemd-user-sessions.service | ||
4 | |||
5 | [Service] | ||
6 | ExecStart=/usr/bin/sdcardmountd | ||
7 | |||
8 | [Install] | ||
9 | WantedBy=multi-user.target | ||
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd/sdcardmountd.sh b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd/sdcardmountd.sh deleted file mode 100755 index 0849cc7..0000000 --- a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd/sdcardmountd.sh +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | ############################################################################ | ||
3 | ## | ||
4 | ## Copyright (C) 2016 The Qt Company Ltd. | ||
5 | ## Contact: https://www.qt.io/licensing/ | ||
6 | ## | ||
7 | ## This file is part of the Boot to Qt meta layer. | ||
8 | ## | ||
9 | ## $QT_BEGIN_LICENSE:GPL$ | ||
10 | ## Commercial License Usage | ||
11 | ## Licensees holding valid commercial Qt licenses may use this file in | ||
12 | ## accordance with the commercial license agreement provided with the | ||
13 | ## Software or, alternatively, in accordance with the terms contained in | ||
14 | ## a written agreement between you and The Qt Company. For licensing terms | ||
15 | ## and conditions see https://www.qt.io/terms-conditions. For further | ||
16 | ## information use the contact form at https://www.qt.io/contact-us. | ||
17 | ## | ||
18 | ## GNU General Public License Usage | ||
19 | ## Alternatively, this file may be used under the terms of the GNU | ||
20 | ## General Public License version 3 or (at your option) any later version | ||
21 | ## approved by the KDE Free Qt Foundation. The licenses are as published by | ||
22 | ## the Free Software Foundation and appearing in the file LICENSE.GPL3 | ||
23 | ## included in the packaging of this file. Please review the following | ||
24 | ## information to ensure the GNU General Public License requirements will | ||
25 | ## be met: https://www.gnu.org/licenses/gpl-3.0.html. | ||
26 | ## | ||
27 | ## $QT_END_LICENSE$ | ||
28 | ## | ||
29 | ############################################################################ | ||
30 | |||
31 | DAEMON=/usr/bin/sdcardmountd | ||
32 | |||
33 | case "$1" in | ||
34 | start) | ||
35 | start-stop-daemon --start --quiet --exec $DAEMON & | ||
36 | ;; | ||
37 | stop) | ||
38 | start-stop-daemon --stop --quiet --exec $DAEMON | ||
39 | ;; | ||
40 | restart) | ||
41 | start-stop-daemon --stop --quiet --exec $DAEMON | ||
42 | sleep 1 | ||
43 | start-stop-daemon --start --quiet --exec $DAEMON & | ||
44 | ;; | ||
45 | *) | ||
46 | echo "Usage: $0 {start|stop|restart}" | ||
47 | exit 1 | ||
48 | esac | ||
49 | exit 0 | ||