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

5 files changed, 5 insertions, 11 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/files/main.conf b/meta-agl-core/recipes-connectivity/connman/connman-conf/main.conf
index 4dba25b70..4dba25b70 100644
--- a/meta-agl-core/recipes-connectivity/connman/files/main.conf
+++ b/meta-agl-core/recipes-connectivity/connman/connman-conf/main.conf
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..4505ab779
--- /dev/null
+++ b/meta-agl-core/recipes-connectivity/connman/connman-conf_aglcore.inc
@@ -0,0 +1,2 @@
+# Pick up our version of main.conf
+FILESEXTRAPATHS:prepend := "${THISDIR}/connman-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..f129a6580 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
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"