aboutsummaryrefslogtreecommitdiffstats
path: root/meta-agl-core/recipes-connectivity
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2021-01-12 17:33:51 -0500
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2021-01-13 12:33:59 +0000
commit33a675555db6f1467a8a585ceefe62ddb1aab3b4 (patch)
tree7f5a4e9f83e6f311be4162b322675fdc9c6201f8 /meta-agl-core/recipes-connectivity
parent18449cad8c545da1a1c3cca7fb0faba3c8aded05 (diff)
meta-agl-core: remove connman cluster demo support
Remove cluster demo support logic from connman bbappend, as it has been moved to meta-agl-demo instead. This improves the separation of core vs demo configuration changes. Bug-AGL: SPEC-3749 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ica4113509a73def565b15e5067c5d7db0a6ecaf1 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25893 Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-agl-core/recipes-connectivity')
-rw-r--r--meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc9
1 files changed, 2 insertions, 7 deletions
diff --git a/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc b/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc
index 469345880..f054c10d7 100644
--- a/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc
+++ b/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc
@@ -10,11 +10,6 @@ PACKAGECONFIG[session-policy-local] = "--enable-session-policy-local,--disable-s
PACKAGECONFIG_append = " session-policy-local"
do_install_append() {
- install -d ${D}${sysconfdir}/connman
- install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/connman
-
- # Need to ignore eth1 in cluster demo setup
- if ${@bb.utils.contains('DISTRO_FEATURES', 'agl-cluster-demo-support', 'true', 'false', d)}; then
- sed -i 's/^\(NetworkInterfaceBlacklist=.*\)/\1,eth1/' ${D}${sysconfdir}/connman/main.conf
- fi
+ install -d ${D}${sysconfdir}/connman
+ install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/connman
}