diff options
author | Oleksandr Kravchuk <oleksandr.kravchuk@pelagicore.com> | 2018-09-25 15:02:59 +0200 |
---|---|---|
committer | Oleksandr Kravchuk <oleksandr.kravchuk@pelagicore.com> | 2018-09-25 13:45:52 +0000 |
commit | eb07887fecb9af29d00e612648c2d96a443a3330 (patch) | |
tree | 0f300afb605eab513a82f8da428d9827236eb0de /meta-boot2qt-distro/recipes-connectivity | |
parent | 49da63424ecb059d00a64ed45d89a98dabcf0af3 (diff) | |
download | meta-boot2qt-eb07887fecb9af29d00e612648c2d96a443a3330.tar.gz |
connman: remove bbappend
Change-Id: Idafcfc55ea3588c811ce41471d94ad63ba657101
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'meta-boot2qt-distro/recipes-connectivity')
3 files changed, 0 insertions, 56 deletions
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 @@ | |||
1 | ############################################################################## | ||
2 | ## | ||
3 | ## Copyright (C) 2016 The Qt Company Ltd. | ||
4 | ## Contact: http://www.qt.io/licensing/ | ||
5 | ## | ||
6 | ## This file is part of the Boot to Qt meta layer. | ||
7 | ## | ||
8 | ## $QT_BEGIN_LICENSE:COMM$ | ||
9 | ## | ||
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 http://www.qt.io/terms-conditions. For further | ||
16 | ## information use the contact form at http://www.qt.io/contact-us. | ||
17 | ## | ||
18 | ## $QT_END_LICENSE$ | ||
19 | ## | ||
20 | ############################################################################## | ||
21 | |||
22 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | ||
23 | |||
24 | 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 @@ | |||
1 | From df70770f33280a915abb413678088a078d82341a Mon Sep 17 00:00:00 2001 | ||
2 | From: Mikko Gronoff <mikko.gronoff@qt.io> | ||
3 | Date: Tue, 20 Sep 2016 11:02:50 +0300 | ||
4 | Subject: [PATCH] Disable connman when booting over NFS | ||
5 | |||
6 | --- | ||
7 | src/connman.service.in | 1 + | ||
8 | 1 file changed, 1 insertion(+) | ||
9 | |||
10 | diff --git a/src/connman.service.in b/src/connman.service.in | ||
11 | index 09dfec9..4132cf7 100644 | ||
12 | --- a/src/connman.service.in | ||
13 | +++ b/src/connman.service.in | ||
14 | @@ -6,6 +6,7 @@ RequiresMountsFor=@localstatedir@/lib/connman | ||
15 | After=dbus.service network-pre.target systemd-sysusers.service | ||
16 | Before=network.target multi-user.target shutdown.target | ||
17 | Wants=network.target | ||
18 | +ConditionKernelCommandLine=!root=/dev/nfs | ||
19 | |||
20 | [Service] | ||
21 | 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 @@ | |||
1 | --- a/src/connman.service.in | ||
2 | +++ b/src/connman.service.in | ||
3 | @@ -7,6 +7,7 @@ | ||
4 | Before=network.target multi-user.target shutdown.target | ||
5 | Wants=network.target | ||
6 | Conflicts=systemd-resolved.service | ||
7 | +ConditionKernelCommandLine=!root=/dev/nfs | ||
8 | |||
9 | [Service] | ||
10 | Type=dbus | ||
11 | |||