From eb07887fecb9af29d00e612648c2d96a443a3330 Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Tue, 25 Sep 2018 15:02:59 +0200 Subject: connman: remove bbappend Change-Id: Idafcfc55ea3588c811ce41471d94ad63ba657101 Reviewed-by: Samuli Piippo --- .../connman/connman_%.bbappend | 24 ---------------------- ...isable-connman-when-booting-over-nfs-1.33.patch | 21 ------------------- ...isable-connman-when-booting-over-nfs-1.34.patch | 11 ---------- 3 files changed, 56 deletions(-) delete mode 100644 meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend delete mode 100644 meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch delete mode 100644 meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch diff --git a/meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend b/meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend deleted file mode 100644 index fda246a..0000000 --- a/meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend +++ /dev/null @@ -1,24 +0,0 @@ -############################################################################## -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:COMM$ -## -## 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 http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## $QT_END_LICENSE$ -## -############################################################################## - -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI += "file://0001-disable-connman-when-booting-over-nfs-${PV}.patch" diff --git a/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch b/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch deleted file mode 100644 index f893746..0000000 --- a/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.33.patch +++ /dev/null @@ -1,21 +0,0 @@ -From df70770f33280a915abb413678088a078d82341a Mon Sep 17 00:00:00 2001 -From: Mikko Gronoff -Date: Tue, 20 Sep 2016 11:02:50 +0300 -Subject: [PATCH] Disable connman when booting over NFS - ---- - src/connman.service.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/connman.service.in b/src/connman.service.in -index 09dfec9..4132cf7 100644 ---- a/src/connman.service.in -+++ b/src/connman.service.in -@@ -6,6 +6,7 @@ RequiresMountsFor=@localstatedir@/lib/connman - After=dbus.service network-pre.target systemd-sysusers.service - Before=network.target multi-user.target shutdown.target - Wants=network.target -+ConditionKernelCommandLine=!root=/dev/nfs - - [Service] - Type=dbus diff --git a/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch b/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch deleted file mode 100644 index 8b46666..0000000 --- a/meta-boot2qt-distro/recipes-connectivity/connman/files/0001-disable-connman-when-booting-over-nfs-1.34.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/connman.service.in -+++ b/src/connman.service.in -@@ -7,6 +7,7 @@ - Before=network.target multi-user.target shutdown.target - Wants=network.target - Conflicts=systemd-resolved.service -+ConditionKernelCommandLine=!root=/dev/nfs - - [Service] - Type=dbus - -- cgit v1.2.3-54-g00ecf