diff options
author | Scott Murray <scott.murray@konsulko.com> | 2024-05-01 16:57:17 -0400 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-05-29 10:27:17 +0000 |
commit | 18058d1ed6ed4235505870067837a26a4864a117 (patch) | |
tree | 132a2cc1452a8c155d2e937a9b6751123bc0f688 /recipes-connectivity | |
parent | e3dad1344fee65f54b639f541c7f10352088462b (diff) |
Replace agl-demo* features with preconfigured images
Changes:
- Remove the agl-demo-preload and agl-demo-cluster-support setup
features.
- Make the agl-weston-remoting setup feature a dependency of the
agl-demo feature. To accommodate this with respect to avoiding
putting the remote-output display configuration into generated
weston.ini files when not required, the logic for that has been
moved from meta-agl-core's weston-ini-conf recipe, and extra
weston-ini-conf-* packages with the remote output support enabled
are now generated to be used in images when required.
- Add *-preconfigured versions of the images useful in a full demo
setup (i.e. with "green machine" for tradeshows). These images
have the configuration tweaks that the build setup features
enabled with conditional logic baked in.
- Remove now unnecessary connman-conf bbappend, we now assume that
the IVI and cluster IP addresses are assigned as 192.168.10.2
and 192.168.10.3 via DHCP in a full demo setup.
Notes:
- The cluster support in the *-preconfigured images assumes that
the IVI board is at IP address 192.168.10.2, and both boards are
in the 192.168.10.x subnet.
Bug-AGL: SPEC-5138
Change-Id: Icc472c6b602fa8fa5570af6cb0acaef853cbfa0f
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29904
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Tested-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'recipes-connectivity')
-rw-r--r-- | recipes-connectivity/connman/connman-conf.bbappend | 1 | ||||
-rw-r--r-- | recipes-connectivity/connman/connman-conf_agldemo.inc | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/recipes-connectivity/connman/connman-conf.bbappend b/recipes-connectivity/connman/connman-conf.bbappend deleted file mode 100644 index 39792fd96..000000000 --- a/recipes-connectivity/connman/connman-conf.bbappend +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 7b736ec6b..000000000 --- a/recipes-connectivity/connman/connman-conf_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-demo-cluster-support', 'true', 'false', d)}; then - sed -i 's/^\(NetworkInterfaceBlacklist=.*\)/\1,eth1/' ${D}${sysconfdir}/connman/main.conf - fi -} |