meta-agl-core: update connman configuration override

Upstream is now supplying a connman main.conf file in the
connman-conf recipe, move installing our own modified
version in our bbappend to just supplying our alternative
file in a connman-conf bbappend.

Bug-AGL: SPEC-3819

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Ib89a24b29fd94093ead9ca6d13d9e60bb97b8a60

2 files changed, 0 insertions, 13 deletions

diff --git a/meta-agl-core/recipes-connectivity/connman/files/0001-disable-when-booting-over-nfs.patch b/meta-agl-core/recipes-connectivity/connman/files/0001-disable-when-booting-over-nfs.patch
deleted file mode 100644
index f129a6580..000000000
--- a/meta-agl-core/recipes-connectivity/connman/files/0001-disable-when-booting-over-nfs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- connman-1.36.orig/src/connman.service.in	2019-02-18 18:02:07.034947373 -0500
-+++ connman-1.36/src/connman.service.in	2019-02-18 18:07:24.689959219 -0500
-@@ -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
diff --git a/meta-agl-core/recipes-connectivity/connman/files/main.conf b/meta-agl-core/recipes-connectivity/connman/files/main.conf
deleted file mode 100644
index 4dba25b70..000000000
--- a/meta-agl-core/recipes-connectivity/connman/files/main.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[General]
-FallbackTimeservers=pool.ntp.org
-NetworkInterfaceBlacklist=vmnet,vboxnet,virbr,ifb,meth