From fec097c007277ffcfb4eeae9dab9a4b5baf07868 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 12 Jan 2021 17:23:58 -0500 Subject: Update agl-cluster-demo-support feature 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 Change-Id: Iad42662db903b7403ec7985c315793fdcd6fc9a7 --- recipes-connectivity/connman/connman_%.bbappend | 1 + recipes-connectivity/connman/connman_agldemo.inc | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 recipes-connectivity/connman/connman_%.bbappend create mode 100644 recipes-connectivity/connman/connman_agldemo.inc (limited to 'recipes-connectivity') diff --git a/recipes-connectivity/connman/connman_%.bbappend b/recipes-connectivity/connman/connman_%.bbappend new file mode 100644 index 000000000..9bcba76c2 --- /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 000000000..1900cc14a --- /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 +} -- cgit 1.2.3-korg