Changes:
- Switch agl-cluster-demo-support from using IMAGE_FEATURES to
AGL_FEATURES to work better with building the different demo
images.
- Add a connman bbappend to move the agl-cluster-demo-support
specific logic out of meta-agl-core.
Bug-AGL: SPEC-3749
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Iad42662db903b7403ec7985c315793fdcd6fc9a7
--- /dev/null
+require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'connman_agldemo.inc', '', d)}
--- /dev/null
+do_install_append() {
+ # Need to ignore eth1 in cluster demo setup
+ if ${@bb.utils.contains('AGL_FEATURES', 'agl-cluster-demo-support', 'true', 'false', d)}; then
+ sed -i 's/^\(NetworkInterfaceBlacklist=.*\)/\1,eth1/' ${D}${sysconfdir}/connman/main.conf
+ fi
+}
cluster-lin-bridging-config \
cluster-demo-simulator \
"
-CLUSTER_SUPPORT = "${@bb.utils.contains("DISTRO_FEATURES", "agl-cluster-demo-support", "${CLUSTER_SUPPORT_PACKAGES}", "",d)}"
+CLUSTER_SUPPORT = "${@bb.utils.contains("AGL_FEATURES", "agl-cluster-demo-support", "${CLUSTER_SUPPORT_PACKAGES}", "",d)}"
DEMO_UNIT_CONF ?= ""
# Hook for demo platform configuration
-DISTRO_FEATURES_append = " agl-cluster-demo-support"
+AGL_FEATURES_append = " agl-cluster-demo-support"