From 77cdbb995c03689e4d020a1c42f5ce5a3d62cfcd Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 11 Apr 2022 19:49:57 -0400 Subject: connman: move bbappend to connman-conf Shift the connman bbappend to connman-conf to match the changes in upstream and meta-agl-core with respect to what installs the connman main.conf. Bug-AGL: SPEC-3819 Signed-off-by: Scott Murray Change-Id: I29c1c4a99c215082081b8d4ddaec6aaadcfd9933 --- recipes-connectivity/connman/connman-conf.bbappend | 1 + recipes-connectivity/connman/connman-conf_agldemo.inc | 6 ++++++ recipes-connectivity/connman/connman_%.bbappend | 1 - recipes-connectivity/connman/connman_agldemo.inc | 6 ------ 4 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 recipes-connectivity/connman/connman-conf.bbappend create mode 100644 recipes-connectivity/connman/connman-conf_agldemo.inc delete mode 100644 recipes-connectivity/connman/connman_%.bbappend delete mode 100644 recipes-connectivity/connman/connman_agldemo.inc diff --git a/recipes-connectivity/connman/connman-conf.bbappend b/recipes-connectivity/connman/connman-conf.bbappend new file mode 100644 index 00000000..39792fd9 --- /dev/null +++ b/recipes-connectivity/connman/connman-conf.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'connman-conf_agldemo.inc', '', d)} diff --git a/recipes-connectivity/connman/connman-conf_agldemo.inc b/recipes-connectivity/connman/connman-conf_agldemo.inc new file mode 100644 index 00000000..5b732ae5 --- /dev/null +++ b/recipes-connectivity/connman/connman-conf_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-connectivity/connman/connman_%.bbappend b/recipes-connectivity/connman/connman_%.bbappend deleted file mode 100644 index 9bcba76c..00000000 --- a/recipes-connectivity/connman/connman_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 5b732ae5..00000000 --- a/recipes-connectivity/connman/connman_agldemo.inc +++ /dev/null @@ -1,6 +0,0 @@ -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