summaryrefslogtreecommitdiffstats
path: root/templates/feature
diff options
context:
space:
mode:
Diffstat (limited to 'templates/feature')
-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-control-panel/50_bblayers.conf.inc13
-rw-r--r--templates/feature/agl-demo-control-panel/50_local.conf.inc2
-rw-r--r--templates/feature/agl-demo-control-panel/README_feature_agl-demo-control-panel.md16
-rw-r--r--templates/feature/agl-demo-html5/50_bblayers.conf.inc6
-rw-r--r--templates/feature/agl-demo-html5/README_feature_agl-demo-html5.md15
-rw-r--r--templates/feature/agl-demo-html5/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/50_bblayers.conf.inc3
-rw-r--r--templates/feature/agl-demo/included.dep2
-rw-r--r--templates/feature/agl-kvm-host-audio/50_local.conf.inc1
-rw-r--r--templates/feature/agl-kvm-host-audio/README_feature_agl-kvm-host-kuksa.md17
-rw-r--r--templates/feature/agl-kvm-host-audio/included.dep1
-rw-r--r--templates/feature/agl-kvm-host-kuksa/50_local.conf.inc1
-rw-r--r--templates/feature/agl-kvm-host-kuksa/README_feature_agl-kvm-host-kuksa.md17
-rw-r--r--templates/feature/agl-kvm-host-kuksa/included.dep1
-rw-r--r--templates/feature/agl-kvm/50_bblayers.conf.inc4
-rw-r--r--templates/feature/agl-kvm/50_local.conf.inc4
-rw-r--r--templates/feature/agl-kvm/included.dep2
22 files changed, 63 insertions, 73 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-control-panel/50_bblayers.conf.inc b/templates/feature/agl-demo-control-panel/50_bblayers.conf.inc
new file mode 100644
index 000000000..479655bc4
--- /dev/null
+++ b/templates/feature/agl-demo-control-panel/50_bblayers.conf.inc
@@ -0,0 +1,13 @@
+# This layer contains the WIP feature/demo code only
+#---------------------------------------------------
+BBLAYERS =+ " \
+ ${METADIR}/meta-agl-demo/meta-agl-demo-control-panel \
+ ${METADIR}/meta-agl/meta-agl-kuksa-val \
+"
+
+#AGL_META_FILESYSTEMS = "${METADIR}/external/meta-openembedded/meta-filesystems"
+#AGL_META_MULTIMEDIA = "${METADIR}/external/meta-openembedded/meta-multimedia"
+#AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking"
+AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python"
+AGL_META_QT5 = "${METADIR}/external/meta-qt6"
+AGL_META_CLANG = " ${METADIR}/external/meta-clang "
diff --git a/templates/feature/agl-demo-control-panel/50_local.conf.inc b/templates/feature/agl-demo-control-panel/50_local.conf.inc
new file mode 100644
index 000000000..54e9a699e
--- /dev/null
+++ b/templates/feature/agl-demo-control-panel/50_local.conf.inc
@@ -0,0 +1,2 @@
+#see meta-agl-demo/conf/include/agl-demo.inc
+#require conf/include/agl-demo-control-panel.inc
diff --git a/templates/feature/agl-demo-control-panel/README_feature_agl-demo-control-panel.md b/templates/feature/agl-demo-control-panel/README_feature_agl-demo-control-panel.md
new file mode 100644
index 000000000..31883cd69
--- /dev/null
+++ b/templates/feature/agl-demo-control-panel/README_feature_agl-demo-control-panel.md
@@ -0,0 +1,16 @@
+---
+description: Feature agl-demo
+authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Martin Kelly <mkelly@xevo.com>, Matt Ranostay <matt.ranostay@konsulko.com>, Philippe Coval <philippe.coval@osg.samsung.com>, Ronan Le Martret <ronan.lemartret@iot.bzh>, Stephane Desneux <stephane.desneux@iot.bzh>
+---
+
+### Feature agl-demo
+
+*Description is missing - please complete file meta-agl-demo/templates/feature/agl-demo/README_feature_agl-demo.md*
+
+#### Dependent features pulled by agl-demo
+
+The following features are pulled:
+
+* agl-profile-graphical-qt5
+* agl-pipewire
+
diff --git a/templates/feature/agl-demo-html5/50_bblayers.conf.inc b/templates/feature/agl-demo-html5/50_bblayers.conf.inc
new file mode 100644
index 000000000..de26d1f94
--- /dev/null
+++ b/templates/feature/agl-demo-html5/50_bblayers.conf.inc
@@ -0,0 +1,6 @@
+BBLAYERS =+ " \
+ ${METADIR}/meta-agl-demo/meta-agl-html5-demo \
+"
+
+# required for WAM and chromium
+AGL_META_CLANG = "${METADIR}/external/meta-clang"
diff --git a/templates/feature/agl-demo-html5/README_feature_agl-demo-html5.md b/templates/feature/agl-demo-html5/README_feature_agl-demo-html5.md
new file mode 100644
index 000000000..518c46673
--- /dev/null
+++ b/templates/feature/agl-demo-html5/README_feature_agl-demo-html5.md
@@ -0,0 +1,15 @@
+---
+description: Feature agl-demo-html5
+authors: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
+---
+
+### Feature agl-demo-html5
+
+* Enables support for building the WAM-based html5 image
+
+### Dependent features pulled by agl-demo-html5
+
+The following features are pulled:
+
+* agl-demo
+
diff --git a/templates/feature/agl-demo-html5/included.dep b/templates/feature/agl-demo-html5/included.dep
new file mode 100644
index 000000000..82639da07
--- /dev/null
+++ b/templates/feature/agl-demo-html5/included.dep
@@ -0,0 +1 @@
+agl-demo
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/50_bblayers.conf.inc b/templates/feature/agl-demo/50_bblayers.conf.inc
index dee536e9e..4e97632ab 100644
--- a/templates/feature/agl-demo/50_bblayers.conf.inc
+++ b/templates/feature/agl-demo/50_bblayers.conf.inc
@@ -1,6 +1,7 @@
# This layer contains the WIP feature/demo code only
#---------------------------------------------------
BBLAYERS =+ " \
+ ${METADIR}/meta-agl/meta-agl-kuksa-val \
${METADIR}/meta-agl-demo \
"
@@ -11,4 +12,4 @@ AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python"
AGL_META_QT5 = "${METADIR}/external/meta-qt5"
# Needed to build CEF and WAM
-AGL_META_CLANG = "${METADIR}/external/meta-clang"
+#AGL_META_CLANG = "${METADIR}/external/meta-clang"
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-host-audio/50_local.conf.inc b/templates/feature/agl-kvm-host-audio/50_local.conf.inc
deleted file mode 100644
index 7bd20e391..000000000
--- a/templates/feature/agl-kvm-host-audio/50_local.conf.inc
+++ /dev/null
@@ -1 +0,0 @@
-AGL_FEATURES += "agl-kvm-host-audio"
diff --git a/templates/feature/agl-kvm-host-audio/README_feature_agl-kvm-host-kuksa.md b/templates/feature/agl-kvm-host-audio/README_feature_agl-kvm-host-kuksa.md
deleted file mode 100644
index 93a4b9ade..000000000
--- a/templates/feature/agl-kvm-host-audio/README_feature_agl-kvm-host-kuksa.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-description: Feature agl-kvm-host-audio
-authors: Scott Murray <scott.murray@konsulko.com>
----
-
-### Feature agl-kvm-host-audio
-
-* Enables support for running audio services on host in KVM+QEMU demo images
-
-### Dependent features pulled by agl-kvm-host-audio
-
-The following features are pulled:
-
-* agl-kvm agl-kvm-host-kuksa
-
-Note that enabling this feature results in a configuration where building images
-other than agl-kvm-demo-platform will likely not give the desired results.
diff --git a/templates/feature/agl-kvm-host-audio/included.dep b/templates/feature/agl-kvm-host-audio/included.dep
deleted file mode 100644
index f1f0a2f99..000000000
--- a/templates/feature/agl-kvm-host-audio/included.dep
+++ /dev/null
@@ -1 +0,0 @@
-agl-kvm agl-kvm-host-kuksa
diff --git a/templates/feature/agl-kvm-host-kuksa/50_local.conf.inc b/templates/feature/agl-kvm-host-kuksa/50_local.conf.inc
deleted file mode 100644
index 6259e41f2..000000000
--- a/templates/feature/agl-kvm-host-kuksa/50_local.conf.inc
+++ /dev/null
@@ -1 +0,0 @@
-AGL_FEATURES += "agl-kvm-host-kuksa"
diff --git a/templates/feature/agl-kvm-host-kuksa/README_feature_agl-kvm-host-kuksa.md b/templates/feature/agl-kvm-host-kuksa/README_feature_agl-kvm-host-kuksa.md
deleted file mode 100644
index 1b607aa3c..000000000
--- a/templates/feature/agl-kvm-host-kuksa/README_feature_agl-kvm-host-kuksa.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-description: Feature agl-kvm-host-kuksa
-authors: Scott Murray <scott.murray@konsulko.com>
----
-
-### Feature agl-kvm-host-kuksa
-
-* Enables support for running KUKSA.val databroker on host in KVM+QEMU demo images
-
-### Dependent features pulled by agl-kvm-host-kuksa
-
-The following features are pulled:
-
-* agl-kvm
-
-Note that enabling this feature results in a configuration where building images
-other than agl-kvm-demo-platform will likely not give the desired results.
diff --git a/templates/feature/agl-kvm-host-kuksa/included.dep b/templates/feature/agl-kvm-host-kuksa/included.dep
deleted file mode 100644
index b2b1014cf..000000000
--- a/templates/feature/agl-kvm-host-kuksa/included.dep
+++ /dev/null
@@ -1 +0,0 @@
-agl-kvm
diff --git a/templates/feature/agl-kvm/50_bblayers.conf.inc b/templates/feature/agl-kvm/50_bblayers.conf.inc
index e5e39118a..162f458be 100644
--- a/templates/feature/agl-kvm/50_bblayers.conf.inc
+++ b/templates/feature/agl-kvm/50_bblayers.conf.inc
@@ -2,3 +2,7 @@ AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python"
AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking"
AGL_META_FILESYSTEMS = "${METADIR}/external/meta-openembedded/meta-filesystems"
AGL_META_VIRTUALIZATION = "${METADIR}/external/meta-virtualization"
+
+BBLAYERS =+ " \
+ ${METADIR}/meta-agl-demo/meta-agl-kvm-demo \
+"
diff --git a/templates/feature/agl-kvm/50_local.conf.inc b/templates/feature/agl-kvm/50_local.conf.inc
index 2798116a2..64bbdbd7f 100644
--- a/templates/feature/agl-kvm/50_local.conf.inc
+++ b/templates/feature/agl-kvm/50_local.conf.inc
@@ -1,2 +1,2 @@
-#see meta-agl-demo/conf/include/agl-kvm.inc
-require conf/include/agl-kvm.inc
+# see meta-agl-demo/meta-agl-kvm-demo/conf/include/agl-kvm.inc
+require meta-agl-kvm-demo/conf/include/agl-kvm.inc
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