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
--- /dev/null
+require ${@bb.utils.contains('AGL_FEATURES', 'aglcore', 'connman-conf_aglcore.inc', '', d)}
--- /dev/null
+# Pick up our version of main.conf
+FILESEXTRAPATHS:prepend := "${THISDIR}/connman-conf:"
-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"