From bd151bb0aa5d5492839fa23a8872014e67425771 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 6 Jun 2022 17:49:59 -0400 Subject: [PATCH] Rename agl-cluster-demo-support feature Rename agl-cluster-demo-support feature to agl-demo-cluster-support to make it clearer that it relates to the agl-demo-platform image. Bug-AGL: SPEC-4425 Signed-off-by: Scott Murray Change-Id: I9e1ebd2800ab55f3969be98034b60fcb4c09ba21 --- recipes-connectivity/connman/connman-conf_agldemo.inc | 2 +- .../packagegroups/packagegroup-agl-demo-platform.bb | 2 +- .../feature/agl-cluster-demo-support/50_local.conf.inc | 1 - .../README_feature_agl-cluster-demo-support.md | 15 --------------- .../feature/agl-demo-cluster-support/50_local.conf.inc | 1 + .../README_feature_agl-demo-cluster-support.md | 17 +++++++++++++++++ .../included.dep | 0 7 files changed, 20 insertions(+), 18 deletions(-) delete mode 100644 templates/feature/agl-cluster-demo-support/50_local.conf.inc delete mode 100644 templates/feature/agl-cluster-demo-support/README_feature_agl-cluster-demo-support.md create mode 100644 templates/feature/agl-demo-cluster-support/50_local.conf.inc create mode 100644 templates/feature/agl-demo-cluster-support/README_feature_agl-demo-cluster-support.md rename templates/feature/{agl-cluster-demo-support => agl-demo-cluster-support}/included.dep (100%) diff --git a/recipes-connectivity/connman/connman-conf_agldemo.inc b/recipes-connectivity/connman/connman-conf_agldemo.inc index 5b732ae52..7b736ec6b 100644 --- a/recipes-connectivity/connman/connman-conf_agldemo.inc +++ b/recipes-connectivity/connman/connman-conf_agldemo.inc @@ -1,6 +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 + if ${@bb.utils.contains('AGL_FEATURES', 'agl-demo-cluster-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 9c4553f29..fdebd24a6 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb @@ -39,7 +39,7 @@ CLUSTER_SUPPORT_PACKAGES = " \ tbtnavi \ cluster-demo-network-config \ " -CLUSTER_SUPPORT = "${@bb.utils.contains("AGL_FEATURES", "agl-cluster-demo-support", "${CLUSTER_SUPPORT_PACKAGES}", "",d)}" +CLUSTER_SUPPORT = "${@bb.utils.contains("AGL_FEATURES", "agl-demo-cluster-support", "${CLUSTER_SUPPORT_PACKAGES}", "",d)}" # Hook for demo platform configuration # ATM used for: diff --git a/templates/feature/agl-cluster-demo-support/50_local.conf.inc b/templates/feature/agl-cluster-demo-support/50_local.conf.inc deleted file mode 100644 index 0be5431bc..000000000 --- a/templates/feature/agl-cluster-demo-support/50_local.conf.inc +++ /dev/null @@ -1 +0,0 @@ -AGL_FEATURES:append = " agl-cluster-demo-support" diff --git a/templates/feature/agl-cluster-demo-support/README_feature_agl-cluster-demo-support.md b/templates/feature/agl-cluster-demo-support/README_feature_agl-cluster-demo-support.md deleted file mode 100644 index bdb04f0ba..000000000 --- a/templates/feature/agl-cluster-demo-support/README_feature_agl-cluster-demo-support.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -description: Feature agl-cluster-demo-support -authors: Scott Murray ---- - -### Feature agl-cluster-demo-support - -*Description is missing - please complete file meta-agl-demo/templates/feature/agl-cluster-demo-support/README_feature_agl-cluster-demo-support.md* - -#### Dependent features pulled by agl-cluster-demo-support - -The following features are pulled: - -* agl-gstrecorder - diff --git a/templates/feature/agl-demo-cluster-support/50_local.conf.inc b/templates/feature/agl-demo-cluster-support/50_local.conf.inc new file mode 100644 index 000000000..188d8e8e5 --- /dev/null +++ b/templates/feature/agl-demo-cluster-support/50_local.conf.inc @@ -0,0 +1 @@ +AGL_FEATURES:append = " agl-demo-cluster-support" diff --git a/templates/feature/agl-demo-cluster-support/README_feature_agl-demo-cluster-support.md b/templates/feature/agl-demo-cluster-support/README_feature_agl-demo-cluster-support.md new file mode 100644 index 000000000..a9ff2cfb5 --- /dev/null +++ b/templates/feature/agl-demo-cluster-support/README_feature_agl-demo-cluster-support.md @@ -0,0 +1,17 @@ +--- +description: Feature agl-demo-cluster-support +authors: Scott Murray +--- + +### Feature agl-demo-cluster-support + +Enables support for remote navigation display on a connected board running +the agl-cluster-demo-platform image. The configuration is in large part +intended for use with the AGL tradeshow demo setup. + +#### Dependent features pulled by agl-demo-cluster-support + +The following features are pulled: + +* agl-weston-remoting + diff --git a/templates/feature/agl-cluster-demo-support/included.dep b/templates/feature/agl-demo-cluster-support/included.dep similarity index 100% rename from templates/feature/agl-cluster-demo-support/included.dep rename to templates/feature/agl-demo-cluster-support/included.dep -- 2.16.6