summaryrefslogtreecommitdiffstats
path: root/meta-agl-core/recipes-connectivity/connman
diff options
context:
space:
mode:
Diffstat (limited to 'meta-agl-core/recipes-connectivity/connman')
-rw-r--r--meta-agl-core/recipes-connectivity/connman/connman-conf/main.conf2
-rw-r--r--meta-agl-core/recipes-connectivity/connman/connman-conf_aglcore.inc7
-rw-r--r--meta-agl-core/recipes-connectivity/connman/connman/0001-disable-when-booting-over-nfs.patch4
3 files changed, 12 insertions, 1 deletions
diff --git a/meta-agl-core/recipes-connectivity/connman/connman-conf/main.conf b/meta-agl-core/recipes-connectivity/connman/connman-conf/main.conf
index 4dba25b70..be9fd0ed2 100644
--- a/meta-agl-core/recipes-connectivity/connman/connman-conf/main.conf
+++ b/meta-agl-core/recipes-connectivity/connman/connman-conf/main.conf
@@ -1,3 +1,3 @@
[General]
FallbackTimeservers=pool.ntp.org
-NetworkInterfaceBlacklist=vmnet,vboxnet,virbr,ifb,meth
+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
index 4505ab779..30a250e1e 100644
--- a/meta-agl-core/recipes-connectivity/connman/connman-conf_aglcore.inc
+++ b/meta-agl-core/recipes-connectivity/connman/connman-conf_aglcore.inc
@@ -1,2 +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/connman/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/connman/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 @@