From 91de3846bf1a8208af8c66212f34a17d10e5ab27 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Fri, 21 Jul 2017 11:19:57 +0200 Subject: emulator: Remove emulator-sdcardmountd It is now integrated in the proxy daemon Change-Id: If15d3f341778c8c366c41a5e350367d0e55130ed Reviewed-by: Mikko Gronoff --- .../b2qt-addons/b2qt-emulator-sdcardmountd.bb | 63 ---------------------- .../b2qt-emulator-sdcardmountd/sdcardmount.service | 9 ---- .../b2qt-emulator-sdcardmountd/sdcardmountd.sh | 49 ----------------- 3 files changed, 121 deletions(-) delete mode 100644 recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb delete mode 100644 recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd/sdcardmount.service delete mode 100755 recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd/sdcardmountd.sh 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 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -DESCRIPTION = "SD-Card mount daemon for Emulator" -LICENSE = "The-Qt-Company-DCLA-2.1" -LIC_FILES_CHKSUM = "file://sdcardmountd.h;md5=709ec9e3c40137fa6068a903c57acdc1;beginline=1;endline=17" - -inherit qmake5 - -SRC_URI = " \ - git://codereview.qt-project.org/tqtc-boot2qt/emulator;branch=${BRANCH};protocol=ssh \ - file://sdcardmountd.sh \ - file://sdcardmount.service \ - " - -SRCREV = "ab4a9f13831f44f3dcd375fa17ed7e102647febe" -BRANCH = "master" -PV = "1.0+git${SRCPV}" - -S = "${WORKDIR}/git/src/helperlibs/sdcarddaemon" - -DEPENDS = "qtbase qtsimulator" - -do_install_append() { - install -m 0755 -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/sdcardmountd.sh ${D}${sysconfdir}/init.d/ - - install -m 0755 -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/sdcardmount.service ${D}${systemd_unitdir}/system/ -} - -INITSCRIPT_NAME = "sdcardmountd.sh" -INITSCRIPT_PARAMS = "defaults 97 10" - -SYSTEMD_SERVICE_${PN} = "sdcardmount.service" - -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 @@ -[Unit] -Description=QtSimulator SD Card Mount Daemon -After=systemd-user-sessions.service - -[Service] -ExecStart=/usr/bin/sdcardmountd - -[Install] -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 @@ -#!/bin/sh -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -DAEMON=/usr/bin/sdcardmountd - -case "$1" in -start) - start-stop-daemon --start --quiet --exec $DAEMON & - ;; -stop) - start-stop-daemon --stop --quiet --exec $DAEMON - ;; -restart) - start-stop-daemon --stop --quiet --exec $DAEMON - sleep 1 - start-stop-daemon --start --quiet --exec $DAEMON & - ;; -*) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac -exit 0 -- cgit v1.2.3-54-g00ecf