summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2024-05-01 16:57:17 -0400
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2024-05-29 10:27:17 +0000
commit18058d1ed6ed4235505870067837a26a4864a117 (patch)
tree132a2cc1452a8c155d2e937a9b6751123bc0f688 /templates
parente3dad1344fee65f54b639f541c7f10352088462b (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 'templates')
-rw-r--r--templates/feature/agl-demo-cluster-support/50_local.conf.inc1
-rw-r--r--templates/feature/agl-demo-cluster-support/README_feature_agl-demo-cluster-support.md17
-rw-r--r--templates/feature/agl-demo-cluster-support/included.dep1
-rw-r--r--templates/feature/agl-demo-preload/50_local.conf.inc2
-rw-r--r--templates/feature/agl-demo-preload/README_feature_agl-demo-preload.md9
-rw-r--r--templates/feature/agl-demo/included.dep2
-rw-r--r--templates/feature/agl-kvm/included.dep2
7 files changed, 2 insertions, 32 deletions
diff --git a/templates/feature/agl-demo-cluster-support/50_local.conf.inc b/templates/feature/agl-demo-cluster-support/50_local.conf.inc
deleted file mode 100644
index 188d8e8e5..000000000
--- a/templates/feature/agl-demo-cluster-support/50_local.conf.inc
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index a9ff2cfb5..000000000
--- a/templates/feature/agl-demo-cluster-support/README_feature_agl-demo-cluster-support.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-description: Feature agl-demo-cluster-support
-authors: Scott Murray <scott.murray@konsulko.com>
----
-
-### 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-demo-cluster-support/included.dep b/templates/feature/agl-demo-cluster-support/included.dep
deleted file mode 100644
index 1e9b35fbf..000000000
--- a/templates/feature/agl-demo-cluster-support/included.dep
+++ /dev/null
@@ -1 +0,0 @@
-agl-weston-remoting
diff --git a/templates/feature/agl-demo-preload/50_local.conf.inc b/templates/feature/agl-demo-preload/50_local.conf.inc
deleted file mode 100644
index 00ff3b718..000000000
--- a/templates/feature/agl-demo-preload/50_local.conf.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-#see meta-agl-demo/conf/include/agl-demo-preload.inc
-require conf/include/agl-demo-preload.inc
diff --git a/templates/feature/agl-demo-preload/README_feature_agl-demo-preload.md b/templates/feature/agl-demo-preload/README_feature_agl-demo-preload.md
deleted file mode 100644
index e5ec847bb..000000000
--- a/templates/feature/agl-demo-preload/README_feature_agl-demo-preload.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-description: Feature agl-demo-preload
-authors: Scott Murray <scott.murray@konsulko.com>
----
-
-### Feature agl-demo-preload
-
-*Description is missing - please complete file meta-agl-demo/templates/feature/agl-demo-preload/README_feature_agl-demo-preload.md*
-
diff --git a/templates/feature/agl-demo/included.dep b/templates/feature/agl-demo/included.dep
index e94759e39..a81b5a431 100644
--- a/templates/feature/agl-demo/included.dep
+++ b/templates/feature/agl-demo/included.dep
@@ -1 +1 @@
-agl-pipewire agl-app-framework agl-selinux agl-flutter
+agl-pipewire agl-app-framework agl-selinux agl-flutter agl-weston-remoting
diff --git a/templates/feature/agl-kvm/included.dep b/templates/feature/agl-kvm/included.dep
index f61c6e009..82639da07 100644
--- a/templates/feature/agl-kvm/included.dep
+++ b/templates/feature/agl-kvm/included.dep
@@ -1 +1 @@
-agl-demo agl-demo-cluster-support agl-demo-preload
+agl-demo