diff options
4 files changed, 9 insertions, 2 deletions
diff --git a/recipes-connectivity/connman/connman_%.bbappend b/recipes-connectivity/connman/connman_%.bbappend new file mode 100644 index 00000000..9bcba76c --- /dev/null +++ b/recipes-connectivity/connman/connman_%.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'connman_agldemo.inc', '', d)} diff --git a/recipes-connectivity/connman/connman_agldemo.inc b/recipes-connectivity/connman/connman_agldemo.inc new file mode 100644 index 00000000..1900cc14 --- /dev/null +++ b/recipes-connectivity/connman/connman_agldemo.inc @@ -0,0 +1,6 @@ +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 +} diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb index 53d478c0..ee2da2f4 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb @@ -54,7 +54,7 @@ CLUSTER_SUPPORT_PACKAGES = " \ 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 diff --git a/templates/feature/agl-cluster-demo-support/50_local.conf.inc b/templates/feature/agl-cluster-demo-support/50_local.conf.inc index f4724b58..fa5481af 100644 --- a/templates/feature/agl-cluster-demo-support/50_local.conf.inc +++ b/templates/feature/agl-cluster-demo-support/50_local.conf.inc @@ -1 +1 @@ -DISTRO_FEATURES_append = " agl-cluster-demo-support" +AGL_FEATURES_append = " agl-cluster-demo-support" |