6 files changed, 19 insertions, 14 deletions
diff --git a/meta-agl-core/recipes-connectivity/connman/connman-conf.bbappend b/meta-agl-core/recipes-connectivity/connman/connman-conf.bbappend
new file mode 100644
index 000000000..bd6e7b75c
--- /dev/null
+++ b/meta-agl-core/recipes-connectivity/connman/connman-conf.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('AGL_FEATURES', 'aglcore', 'connman-conf_aglcore.inc', '', d)}
diff --git a/meta-agl-core/recipes-connectivity/connman/connman-conf/main.conf b/meta-agl-core/recipes-connectivity/connman/connman-conf/main.conf
new file mode 100644
index 000000000..be9fd0ed2
--- /dev/null
+++ b/meta-agl-core/recipes-connectivity/connman/connman-conf/main.conf
@@ -0,0 +1,3 @@
+[General]
+FallbackTimeservers=pool.ntp.org
+NetworkInterfaceBlacklist=vmnet,vboxnet,virbr,tap,ifb,meth
diff --git a/meta-agl-core/recipes-connectivity/connman/connman-conf_aglcore.inc b/meta-agl-core/recipes-connectivity/connman/connman-conf_aglcore.inc
new file mode 100644
index 000000000..30a250e1e
--- /dev/null
+++ b/meta-agl-core/recipes-connectivity/connman/connman-conf_aglcore.inc
@@ -0,0 +1,9 @@
+# Pick up our version of main.conf
+FILESEXTRAPATHS:prepend := "${THISDIR}/connman-conf:"
+
+# Upstream connman-conf only installs configuration for qemu targets
+# but we need it in all our BSP
+do_install:append() {
+    mkdir -p ${D}${sysconfdir}/connman
+    cp ${S}/main.conf ${D}${sysconfdir}/connman/main.conf
+}
diff --git a/meta-agl-core/recipes-connectivity/connman/files/0001-disable-when-booting-over-nfs.patch b/meta-agl-core/recipes-connectivity/connman/connman/0001-disable-when-booting-over-nfs.patch
index f129a6580..7cc92e2c4 100644
--- a/meta-agl-core/recipes-connectivity/connman/files/0001-disable-when-booting-over-nfs.patch
+++ b/meta-agl-core/recipes-connectivity/connman/connman/0001-disable-when-booting-over-nfs.patch
@@ -1,3 +1,7 @@
+Exempt when nfs is in use.
+
+Upstream-Status: Pending
+
 --- 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 @@
diff --git a/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc b/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc
index 7299d18f3..e372e9186 100644
--- a/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc
+++ b/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc
@@ -1,12 +1,3 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/connman:"
 
-SRC_URI += "file://0001-disable-when-booting-over-nfs.patch \
-            file://main.conf \
-"
-
-FILES:${PN} += "${sysconfdir}/connman/main.conf"
-
-do_install:append() {
-    install -d ${D}${sysconfdir}/connman
-    install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/connman
-}
+SRC_URI += "file://0001-disable-when-booting-over-nfs.patch"
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