summaryrefslogtreecommitdiffstats
path: root/templates/feature
diff options
context:
space:
mode:
Diffstat (limited to 'templates/feature')
-rw-r--r--templates/feature/agl-app-framework/50_bblayers.conf.inc4
-rw-r--r--templates/feature/agl-app-framework/50_local.conf.inc2
-rw-r--r--templates/feature/agl-appfw-smack/50_local.conf.inc0
-rw-r--r--templates/feature/agl-appfw-smack/README_feature_agl-appfw-smack.md9
-rw-r--r--templates/feature/agl-ci-change-features-nogfx/included.dep2
-rw-r--r--templates/feature/agl-ci-change-features/included.dep2
-rw-r--r--templates/feature/agl-ci/99_local.conf.inc32
-rw-r--r--templates/feature/agl-ci/included.dep1
-rw-r--r--templates/feature/agl-create-spdx/50_local.conf.inc2
-rw-r--r--templates/feature/agl-create-spdx/README_feature_agl-create-spdx.md7
-rw-r--r--templates/feature/agl-devel/README_feature_agl-devel.md2
-rw-r--r--templates/feature/agl-devel/included.dep1
-rw-r--r--templates/feature/agl-gplv2/50_bblayers.conf.inc1
-rw-r--r--templates/feature/agl-gplv2/50_local.conf.inc2
-rw-r--r--templates/feature/agl-gplv2/README_feature_agl-gplv2.md9
-rw-r--r--templates/feature/agl-hmi-framework/50_local.conf.inc4
-rw-r--r--templates/feature/agl-hmi-framework/README_feature_agl-hmi-framework.md9
-rw-r--r--templates/feature/agl-localdev/80_bblayers.conf.inc3
-rw-r--r--templates/feature/agl-localdev/80_local.conf.inc2
-rw-r--r--templates/feature/agl-localdev/README_feature_agl-localdev.md9
-rw-r--r--templates/feature/agl-netboot/50_bblayers.conf.inc8
-rw-r--r--templates/feature/agl-package-management/50_local.conf.inc2
-rw-r--r--templates/feature/agl-package-management/README_feature_agl-package-management.md8
-rw-r--r--templates/feature/agl-profile-cluster-qt5/50_bblayers.conf.inc3
-rw-r--r--templates/feature/agl-profile-cluster-qt5/README_feature_agl-profile-cluster-qt5.md15
-rw-r--r--templates/feature/agl-profile-cluster-qt5/included.dep1
-rw-r--r--templates/feature/agl-profile-cluster/50_bblayers.conf.inc3
-rw-r--r--templates/feature/agl-profile-cluster/README_feature_agl-profile-cluster.md15
-rw-r--r--templates/feature/agl-profile-cluster/included.dep1
-rw-r--r--templates/feature/agl-profile-graphical-html5/50_bblayers.conf.inc6
-rw-r--r--templates/feature/agl-profile-graphical-html5/50_local.conf.inc3
-rw-r--r--templates/feature/agl-profile-graphical-html5/README_feature_agl-profile-graphical-html5.md8
-rw-r--r--templates/feature/agl-profile-graphical-html5/included.dep1
-rw-r--r--templates/feature/agl-profile-graphical-qt5/50_bblayers.conf.inc9
-rw-r--r--templates/feature/agl-profile-graphical-qt5/README_feature_agl-profile-graphical-qt5.md15
-rw-r--r--templates/feature/agl-profile-graphical-qt5/included.dep1
-rw-r--r--templates/feature/agl-profile-graphical/50_bblayers.conf.inc3
-rw-r--r--templates/feature/agl-profile-graphical/README_feature_agl-profile-graphical.md9
-rw-r--r--templates/feature/agl-profile-hud/50_bblayers.conf.inc3
-rw-r--r--templates/feature/agl-profile-hud/README_feature_agl-profile-hud.md9
-rw-r--r--templates/feature/agl-profile-telematics/50_bblayers.conf.inc3
-rw-r--r--templates/feature/agl-profile-telematics/README_feature_agl-profile-telematics.md9
-rw-r--r--templates/feature/agl-ptest/90_local.conf.inc8
-rw-r--r--templates/feature/agl-refhw-h3/50_bblayers.conf.inc3
-rw-r--r--templates/feature/agl-refhw-h3/50_local.conf.inc2
-rw-r--r--templates/feature/agl-refhw-h3/README_feature_agl-refhw-h3.md8
-rw-r--r--templates/feature/agl-selinux/50_bblayers.conf.inc5
-rw-r--r--templates/feature/agl-selinux/50_local.conf.inc2
-rw-r--r--templates/feature/agl-selinux/README_feature_agl-selinux.md9
-rw-r--r--templates/feature/agl-sign-wgts/50_local.conf.inc2
-rw-r--r--templates/feature/agl-sign-wgts/README_feature_agl-sign-wgts.md8
-rw-r--r--templates/feature/agl-sota/50_bblayers.conf.inc3
-rw-r--r--templates/feature/agl-sota/50_local.conf.inc8
-rw-r--r--templates/feature/agl-sota/50_setup.sh26
-rw-r--r--templates/feature/agl-sota/README_feature_agl-sota.md9
-rw-r--r--templates/feature/agl-virt/50_bblayers.conf.inc8
-rw-r--r--templates/feature/agl-virt/50_local.conf.inc2
-rw-r--r--templates/feature/agl-weston-remoting/50_local.conf.inc2
-rw-r--r--templates/feature/agl-weston-remoting/included.dep2
59 files changed, 122 insertions, 223 deletions
diff --git a/templates/feature/agl-app-framework/50_bblayers.conf.inc b/templates/feature/agl-app-framework/50_bblayers.conf.inc
new file mode 100644
index 000000000..e6eacd9d8
--- /dev/null
+++ b/templates/feature/agl-app-framework/50_bblayers.conf.inc
@@ -0,0 +1,4 @@
+
+BBLAYERS =+ " \
+ ${METADIR}/meta-agl/meta-app-framework \
+ "
diff --git a/templates/feature/agl-app-framework/50_local.conf.inc b/templates/feature/agl-app-framework/50_local.conf.inc
new file mode 100644
index 000000000..ce541a7b0
--- /dev/null
+++ b/templates/feature/agl-app-framework/50_local.conf.inc
@@ -0,0 +1,2 @@
+#see meta-agl/meta-app-framework/conf/include/agl-app-framework.inc
+require conf/include/agl-app-framework.inc
diff --git a/templates/feature/agl-appfw-smack/50_local.conf.inc b/templates/feature/agl-appfw-smack/50_local.conf.inc
deleted file mode 100644
index e69de29bb..000000000
--- a/templates/feature/agl-appfw-smack/50_local.conf.inc
+++ /dev/null
diff --git a/templates/feature/agl-appfw-smack/README_feature_agl-appfw-smack.md b/templates/feature/agl-appfw-smack/README_feature_agl-appfw-smack.md
deleted file mode 100644
index c96edac38..000000000
--- a/templates/feature/agl-appfw-smack/README_feature_agl-appfw-smack.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-description: Feature agl-appfw-smack
-authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, José Bollo <jose.bollo@iot.bzh>, Ronan Le Martret <ronan.lemartret@iot.bzh>, Stephane Desneux <stephane.desneux@iot.bzh>
----
-
-### Feature agl-appfw-smack
-
-*Description is missing - please complete file meta-agl/templates/feature/agl-appfw-smack/README_feature_agl-appfw-smack.md*
-
diff --git a/templates/feature/agl-ci-change-features-nogfx/included.dep b/templates/feature/agl-ci-change-features-nogfx/included.dep
index 64e2103ca..27e9852f7 100644
--- a/templates/feature/agl-ci-change-features-nogfx/included.dep
+++ b/templates/feature/agl-ci-change-features-nogfx/included.dep
@@ -1 +1 @@
-agl-demo agl-devel agl-netboot agl-pipewire agl-cloudproxy agl-buildstats agl-ptest
+agl-demo agl-devel agl-netboot agl-pipewire agl-buildstats agl-ptest
diff --git a/templates/feature/agl-ci-change-features/included.dep b/templates/feature/agl-ci-change-features/included.dep
index 64e2103ca..27e9852f7 100644
--- a/templates/feature/agl-ci-change-features/included.dep
+++ b/templates/feature/agl-ci-change-features/included.dep
@@ -1 +1 @@
-agl-demo agl-devel agl-netboot agl-pipewire agl-cloudproxy agl-buildstats agl-ptest
+agl-demo agl-devel agl-netboot agl-pipewire agl-buildstats agl-ptest
diff --git a/templates/feature/agl-ci/99_local.conf.inc b/templates/feature/agl-ci/99_local.conf.inc
index 8f6f697cd..e17bc83a9 100644
--- a/templates/feature/agl-ci/99_local.conf.inc
+++ b/templates/feature/agl-ci/99_local.conf.inc
@@ -1,4 +1,32 @@
-DISTRO_FEATURES_append = " AGLCI"
+AGL_FEATURES:append = " AGLCI"
# opencv seems to have a parallel make bug
# ...contrib/modules/xfeatures2d/test/test_features2d.cpp:51:10: fatal error: features2d/test/test_detectors_regression.impl.hpp: No such file or directory
-PARALLEL_MAKE_pn-opencv = "-j 1"
+PARALLEL_MAKE:pn-opencv = "-j 1"
+
+AGL_HOST_PREMIRROR ?= "http://download.automotivelinux.org"
+AGL_HOST_SSTATE_MIRROR ?= "http://download.automotivelinux.org"
+
+PREMIRRORS = " \
+git://.*/.* ${AGL_HOST_PREMIRROR}/AGL/mirror/ \n \
+ftp://.*/.* ${AGL_HOST_PREMIRROR}/AGL/mirror/ \n \
+http://.*/.* ${AGL_HOST_PREMIRROR}/AGL/mirror/ \n \
+https://.*/.* ${AGL_HOST_PREMIRROR}/AGL/mirror/ \n \
+"
+
+SSTATE_MIRRORS = " file://.* ${AGL_HOST_SSTATE_MIRROR}/sstate-mirror/master/${DEFAULTTUNE}/PATH;downloadfilename=PATH \n "
+
+#INHERIT += "packagefeed-stability"
+INHERIT += "buildhistory"
+INHERIT += "buildstats"
+INHERIT += "buildstats-summary"
+
+# setup for PRSERV and HASHSERV
+#AGL_HOST_PRSERV ?= "10.30.72.18"
+#AGL_HOST_HASHSERV ?= "10.30.72.18"
+
+#BB_HASHSERVE = "${AGL_HOST_HASHSERV}:8383"
+#BB_SIGNATURE_HANDLER = "OEEquivHash"
+
+#PRSERV_HOST = "${AGL_HOST_PRSERV}:8181"
+
+IMAGE_INSTALL:append = " curl"
diff --git a/templates/feature/agl-ci/included.dep b/templates/feature/agl-ci/included.dep
new file mode 100644
index 000000000..21543697b
--- /dev/null
+++ b/templates/feature/agl-ci/included.dep
@@ -0,0 +1 @@
+agl-create-spdx
diff --git a/templates/feature/agl-create-spdx/50_local.conf.inc b/templates/feature/agl-create-spdx/50_local.conf.inc
new file mode 100644
index 000000000..2dd5314f3
--- /dev/null
+++ b/templates/feature/agl-create-spdx/50_local.conf.inc
@@ -0,0 +1,2 @@
+#see meta-agl/meta-agl/conf/include/agl-devel.inc
+require conf/include/agl-create-spdx.inc
diff --git a/templates/feature/agl-create-spdx/README_feature_agl-create-spdx.md b/templates/feature/agl-create-spdx/README_feature_agl-create-spdx.md
new file mode 100644
index 000000000..332a9dbd5
--- /dev/null
+++ b/templates/feature/agl-create-spdx/README_feature_agl-create-spdx.md
@@ -0,0 +1,7 @@
+---
+description: Feature agl-create-spdx
+authors: Jan-Simon Moeller <jsmoeller@linuxfoundation.rg>
+---
+
+### Feature agl-create-spdx
+Activation of the create-spdx class in oe-core.
diff --git a/templates/feature/agl-devel/README_feature_agl-devel.md b/templates/feature/agl-devel/README_feature_agl-devel.md
index 24483f95e..588bb3cdc 100644
--- a/templates/feature/agl-devel/README_feature_agl-devel.md
+++ b/templates/feature/agl-devel/README_feature_agl-devel.md
@@ -25,7 +25,7 @@ The following example shows how to activate C/C++ code
specific to agl-devel:
```yocto
-CPPFLAGS_append_agl-devel = " -DAGL_DEVEL"
+CPPFLAGS:append:agl-devel = " -DAGL_DEVEL"
```
Using this, any code enclosed in
diff --git a/templates/feature/agl-devel/included.dep b/templates/feature/agl-devel/included.dep
new file mode 100644
index 000000000..115ecf19a
--- /dev/null
+++ b/templates/feature/agl-devel/included.dep
@@ -0,0 +1 @@
+agl-package-management
diff --git a/templates/feature/agl-gplv2/50_bblayers.conf.inc b/templates/feature/agl-gplv2/50_bblayers.conf.inc
deleted file mode 100644
index a0f26980d..000000000
--- a/templates/feature/agl-gplv2/50_bblayers.conf.inc
+++ /dev/null
@@ -1 +0,0 @@
-BBLAYERS =+ "${METADIR}/external/meta-gplv2"
diff --git a/templates/feature/agl-gplv2/50_local.conf.inc b/templates/feature/agl-gplv2/50_local.conf.inc
deleted file mode 100644
index 8e0d5df74..000000000
--- a/templates/feature/agl-gplv2/50_local.conf.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-#see meta-agl/meta-agl/conf/include/agl-gplv2.inc
-require conf/include/agl-gplv2.inc
diff --git a/templates/feature/agl-gplv2/README_feature_agl-gplv2.md b/templates/feature/agl-gplv2/README_feature_agl-gplv2.md
deleted file mode 100644
index ffbe331b8..000000000
--- a/templates/feature/agl-gplv2/README_feature_agl-gplv2.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-description: Feature agl-gplv2
-authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Martin Kelly <mkelly@xevo.com>
----
-
-### Feature agl-gplv2
-
-*Description is missing - please complete file meta-agl/templates/feature/agl-gplv2/README_feature_agl-gplv2.md*
-
diff --git a/templates/feature/agl-hmi-framework/50_local.conf.inc b/templates/feature/agl-hmi-framework/50_local.conf.inc
deleted file mode 100644
index d251e183d..000000000
--- a/templates/feature/agl-hmi-framework/50_local.conf.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-# In order to enable the hmi-framework features ,
-# enables the following line:
-#
-DISTRO_FEATURES_append = " agl-hmi-framework"
diff --git a/templates/feature/agl-hmi-framework/README_feature_agl-hmi-framework.md b/templates/feature/agl-hmi-framework/README_feature_agl-hmi-framework.md
deleted file mode 100644
index e298023d9..000000000
--- a/templates/feature/agl-hmi-framework/README_feature_agl-hmi-framework.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-description: Feature agl-hmi-framework
-authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Scott Murray <scott.murray@konsulko.com>
----
-
-### Feature agl-hmi-framework
-
-*Description is missing - please complete file meta-agl/templates/feature/agl-hmi-framework/README_feature_agl-hmi-framework.md*
-
diff --git a/templates/feature/agl-localdev/80_bblayers.conf.inc b/templates/feature/agl-localdev/80_bblayers.conf.inc
new file mode 100644
index 000000000..d9bb9d070
--- /dev/null
+++ b/templates/feature/agl-localdev/80_bblayers.conf.inc
@@ -0,0 +1,3 @@
+# Local derivations during development, just add a layer in the folder meta-localdev
+BBLAYERS =+ "${@'${METADIR}/meta-localdev' if os.path.exists('${METADIR}/meta-localdev') else ''}"
+
diff --git a/templates/feature/agl-localdev/80_local.conf.inc b/templates/feature/agl-localdev/80_local.conf.inc
new file mode 100644
index 000000000..6c9213512
--- /dev/null
+++ b/templates/feature/agl-localdev/80_local.conf.inc
@@ -0,0 +1,2 @@
+# (weak) include userspecific local.dev.inc
+include local.dev.inc
diff --git a/templates/feature/agl-localdev/README_feature_agl-localdev.md b/templates/feature/agl-localdev/README_feature_agl-localdev.md
new file mode 100644
index 000000000..111ae4ec0
--- /dev/null
+++ b/templates/feature/agl-localdev/README_feature_agl-localdev.md
@@ -0,0 +1,9 @@
+---
+description: enable local layer for development purposes
+authors: Stéphane Desneux <stephane.desneux@iot.bzh>
+---
+
+### Feature agl-localdev
+
+Adds a local layer named "meta-localdev" in meta directory and a local.dev.inc conf file if present.
+
diff --git a/templates/feature/agl-netboot/50_bblayers.conf.inc b/templates/feature/agl-netboot/50_bblayers.conf.inc
index 3d2ed6460..94e784a1a 100644
--- a/templates/feature/agl-netboot/50_bblayers.conf.inc
+++ b/templates/feature/agl-netboot/50_bblayers.conf.inc
@@ -1 +1,7 @@
-BBLAYERS =+ "${METADIR}/meta-agl/meta-netboot"
+BBLAYERS =+ " ${METADIR}/meta-agl/meta-netboot \
+ "
+
+# Indirection to avoid duplicate inclusions of the same folder into BBLAYERS
+# the evaluation is in the bblayers.conf.sample in meta-agl/meta-agl-core/conf/templates/base
+AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python"
+AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking"
diff --git a/templates/feature/agl-package-management/50_local.conf.inc b/templates/feature/agl-package-management/50_local.conf.inc
new file mode 100644
index 000000000..641a327c9
--- /dev/null
+++ b/templates/feature/agl-package-management/50_local.conf.inc
@@ -0,0 +1,2 @@
+#see meta-agl/meta-agl/conf/include/agl-package-management.inc
+require conf/include/agl-package-management.inc
diff --git a/templates/feature/agl-package-management/README_feature_agl-package-management.md b/templates/feature/agl-package-management/README_feature_agl-package-management.md
new file mode 100644
index 000000000..37562dd00
--- /dev/null
+++ b/templates/feature/agl-package-management/README_feature_agl-package-management.md
@@ -0,0 +1,8 @@
+---
+description: Feature agl-package-management
+authors: Scott Murray <scott.murray@konsulko.com>, Jan-Simon Möller <jsmoeller@linuxfoundation.org>
+---
+
+### Feature agl-package-management
+
+Adds package management to images.
diff --git a/templates/feature/agl-profile-cluster-qt5/50_bblayers.conf.inc b/templates/feature/agl-profile-cluster-qt5/50_bblayers.conf.inc
deleted file mode 100644
index f1aef074d..000000000
--- a/templates/feature/agl-profile-cluster-qt5/50_bblayers.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-BBLAYERS =+ " \
- ${METADIR}/meta-agl/meta-agl-profile-cluster-qt5 \
-"
diff --git a/templates/feature/agl-profile-cluster-qt5/README_feature_agl-profile-cluster-qt5.md b/templates/feature/agl-profile-cluster-qt5/README_feature_agl-profile-cluster-qt5.md
deleted file mode 100644
index 095a8db18..000000000
--- a/templates/feature/agl-profile-cluster-qt5/README_feature_agl-profile-cluster-qt5.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-description: Feature agl-profile-cluster-qt5
-authors: Scott Murray <scott.murray@konsulko.com>
----
-
-### Feature agl-profile-cluster-qt5
-
-*Description is missing - please complete file meta-agl/templates/feature/agl-profile-cluster-qt5/README_feature_agl-profile-cluster-qt5.md*
-
-#### Dependent features pulled by agl-profile-cluster-qt5
-
-The following features are pulled:
-
-* agl-profile-graphical-qt5
-
diff --git a/templates/feature/agl-profile-cluster-qt5/included.dep b/templates/feature/agl-profile-cluster-qt5/included.dep
deleted file mode 100644
index 21b1fa6bc..000000000
--- a/templates/feature/agl-profile-cluster-qt5/included.dep
+++ /dev/null
@@ -1 +0,0 @@
-agl-profile-graphical-qt5
diff --git a/templates/feature/agl-profile-cluster/50_bblayers.conf.inc b/templates/feature/agl-profile-cluster/50_bblayers.conf.inc
deleted file mode 100644
index b430dc7db..000000000
--- a/templates/feature/agl-profile-cluster/50_bblayers.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-BBLAYERS =+ " \
- ${METADIR}/meta-agl/meta-agl-profile-cluster \
-"
diff --git a/templates/feature/agl-profile-cluster/README_feature_agl-profile-cluster.md b/templates/feature/agl-profile-cluster/README_feature_agl-profile-cluster.md
deleted file mode 100644
index 544dc7c8e..000000000
--- a/templates/feature/agl-profile-cluster/README_feature_agl-profile-cluster.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-description: Feature agl-profile-cluster
-authors: Scott Murray <scott.murray@konsulko.com>
----
-
-### Feature agl-profile-cluster
-
-*Description is missing - please complete file meta-agl/templates/feature/agl-profile-cluster/README_feature_agl-profile-cluster.md*
-
-#### Dependent features pulled by agl-profile-cluster
-
-The following features are pulled:
-
-* agl-profile-graphical
-
diff --git a/templates/feature/agl-profile-cluster/included.dep b/templates/feature/agl-profile-cluster/included.dep
deleted file mode 100644
index 032609b8a..000000000
--- a/templates/feature/agl-profile-cluster/included.dep
+++ /dev/null
@@ -1 +0,0 @@
-agl-profile-graphical
diff --git a/templates/feature/agl-profile-graphical-html5/50_bblayers.conf.inc b/templates/feature/agl-profile-graphical-html5/50_bblayers.conf.inc
deleted file mode 100644
index a35f93fb5..000000000
--- a/templates/feature/agl-profile-graphical-html5/50_bblayers.conf.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-BBLAYERS =+ " \
- ${METADIR}/meta-agl/meta-agl-profile-graphical-html5 \
- ${METADIR}/external/meta-python2 \
- "
-
diff --git a/templates/feature/agl-profile-graphical-html5/50_local.conf.inc b/templates/feature/agl-profile-graphical-html5/50_local.conf.inc
deleted file mode 100644
index 0b2d70028..000000000
--- a/templates/feature/agl-profile-graphical-html5/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-
-IMAGE_INSTALL_append = " packagegroup-agl-profile-graphical-html5"
-
diff --git a/templates/feature/agl-profile-graphical-html5/README_feature_agl-profile-graphical-html5.md b/templates/feature/agl-profile-graphical-html5/README_feature_agl-profile-graphical-html5.md
deleted file mode 100644
index dc00f94c2..000000000
--- a/templates/feature/agl-profile-graphical-html5/README_feature_agl-profile-graphical-html5.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-description: Feature agl-profile-graphical-html5
-authors: Jacobo Aragunde Pérez <jaragunde@igalia.com>
----
-
-### Feature agl-profile-graphical-html5
-
-Packages required to run web applications in AGL. The provided image agl-image-graphical-html5 includes the minimum set of packages required for this purpose.
diff --git a/templates/feature/agl-profile-graphical-html5/included.dep b/templates/feature/agl-profile-graphical-html5/included.dep
deleted file mode 100644
index 032609b8a..000000000
--- a/templates/feature/agl-profile-graphical-html5/included.dep
+++ /dev/null
@@ -1 +0,0 @@
-agl-profile-graphical
diff --git a/templates/feature/agl-profile-graphical-qt5/50_bblayers.conf.inc b/templates/feature/agl-profile-graphical-qt5/50_bblayers.conf.inc
deleted file mode 100644
index 960267908..000000000
--- a/templates/feature/agl-profile-graphical-qt5/50_bblayers.conf.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-BBLAYERS =+ " \
- ${METADIR}/meta-agl/meta-agl-profile-graphical-qt5 \
-"
-
-# These are the dependencies
-#---------------------------
-BBLAYERS =+ " \
- ${METADIR}/external/meta-qt5 \
-"
diff --git a/templates/feature/agl-profile-graphical-qt5/README_feature_agl-profile-graphical-qt5.md b/templates/feature/agl-profile-graphical-qt5/README_feature_agl-profile-graphical-qt5.md
deleted file mode 100644
index 387de2ca4..000000000
--- a/templates/feature/agl-profile-graphical-qt5/README_feature_agl-profile-graphical-qt5.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-description: Feature agl-profile-graphical-qt5
-authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
----
-
-### Feature agl-profile-graphical-qt5
-
-*Description is missing - please complete file meta-agl/templates/feature/agl-profile-graphical-qt5/README_feature_agl-profile-graphical-qt5.md*
-
-#### Dependent features pulled by agl-profile-graphical-qt5
-
-The following features are pulled:
-
-* agl-profile-graphical
-
diff --git a/templates/feature/agl-profile-graphical-qt5/included.dep b/templates/feature/agl-profile-graphical-qt5/included.dep
deleted file mode 100644
index 5b54430da..000000000
--- a/templates/feature/agl-profile-graphical-qt5/included.dep
+++ /dev/null
@@ -1 +0,0 @@
-agl-profile-graphical \ No newline at end of file
diff --git a/templates/feature/agl-profile-graphical/50_bblayers.conf.inc b/templates/feature/agl-profile-graphical/50_bblayers.conf.inc
deleted file mode 100644
index 44b0885dc..000000000
--- a/templates/feature/agl-profile-graphical/50_bblayers.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-BBLAYERS =+ " \
- ${METADIR}/meta-agl/meta-agl-profile-graphical \
-"
diff --git a/templates/feature/agl-profile-graphical/README_feature_agl-profile-graphical.md b/templates/feature/agl-profile-graphical/README_feature_agl-profile-graphical.md
deleted file mode 100644
index 594d047e7..000000000
--- a/templates/feature/agl-profile-graphical/README_feature_agl-profile-graphical.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-description: Feature agl-profile-graphical
-authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
----
-
-### Feature agl-profile-graphical
-
-*Description is missing - please complete file meta-agl/templates/feature/agl-profile-graphical/README_feature_agl-profile-graphical.md*
-
diff --git a/templates/feature/agl-profile-hud/50_bblayers.conf.inc b/templates/feature/agl-profile-hud/50_bblayers.conf.inc
deleted file mode 100644
index 047383710..000000000
--- a/templates/feature/agl-profile-hud/50_bblayers.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-BBLAYERS =+ " \
- ${METADIR}/meta-agl/meta-agl-profile-hud \
-"
diff --git a/templates/feature/agl-profile-hud/README_feature_agl-profile-hud.md b/templates/feature/agl-profile-hud/README_feature_agl-profile-hud.md
deleted file mode 100644
index b4387c129..000000000
--- a/templates/feature/agl-profile-hud/README_feature_agl-profile-hud.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-description: Feature agl-profile-hud
-authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
----
-
-### Feature agl-profile-hud
-
-*Description is missing - please complete file meta-agl/templates/feature/agl-profile-hud/README_feature_agl-profile-hud.md*
-
diff --git a/templates/feature/agl-profile-telematics/50_bblayers.conf.inc b/templates/feature/agl-profile-telematics/50_bblayers.conf.inc
deleted file mode 100644
index 874b438f0..000000000
--- a/templates/feature/agl-profile-telematics/50_bblayers.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-BBLAYERS =+ " \
- ${METADIR}/meta-agl/meta-agl-profile-telematics \
-"
diff --git a/templates/feature/agl-profile-telematics/README_feature_agl-profile-telematics.md b/templates/feature/agl-profile-telematics/README_feature_agl-profile-telematics.md
deleted file mode 100644
index 6abcd5d24..000000000
--- a/templates/feature/agl-profile-telematics/README_feature_agl-profile-telematics.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-description: Feature agl-profile-telematics
-authors: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
----
-
-### Feature agl-profile-telematics
-
-*Description is missing - please complete file meta-agl/templates/feature/agl-profile-telematics/README_feature_agl-profile-telematics.md*
-
diff --git a/templates/feature/agl-ptest/90_local.conf.inc b/templates/feature/agl-ptest/90_local.conf.inc
index 4c546e70e..dcaf72ab3 100644
--- a/templates/feature/agl-ptest/90_local.conf.inc
+++ b/templates/feature/agl-ptest/90_local.conf.inc
@@ -1,9 +1,9 @@
# Enabling ptest in image ...
-OVERRIDES .= ":agl-ptest"
-DISTRO_FEATURES_append = " ptest"
-EXTRA_IMAGE_FEATURES_append = " ptest-pkgs"
-IMAGE_INSTALL_append = " lua-ptest xmlsec1-ptest libxml2-ptest"
+OVERRIDES:append = ":agl-ptest"
+DISTRO_FEATURES:append = " ptest"
+EXTRA_IMAGE_FEATURES:append = " ptest-pkgs"
+IMAGE_INSTALL:append = " lua-ptest xmlsec1-ptest libxml2-ptest"
# / ptest
diff --git a/templates/feature/agl-refhw-h3/50_bblayers.conf.inc b/templates/feature/agl-refhw-h3/50_bblayers.conf.inc
new file mode 100644
index 000000000..7aee6eac5
--- /dev/null
+++ b/templates/feature/agl-refhw-h3/50_bblayers.conf.inc
@@ -0,0 +1,3 @@
+BBLAYERS =+ "\
+ ${METADIR}/bsp/meta-agl-refhw/meta-agl-refhw-gen3 \
+ "
diff --git a/templates/feature/agl-refhw-h3/50_local.conf.inc b/templates/feature/agl-refhw-h3/50_local.conf.inc
new file mode 100644
index 000000000..dc39dd52a
--- /dev/null
+++ b/templates/feature/agl-refhw-h3/50_local.conf.inc
@@ -0,0 +1,2 @@
+#see meta-agl/meta-agl-bsp/conf/include/agl_refhw-h3.inc
+require conf/include/agl_refhw-h3.inc
diff --git a/templates/feature/agl-refhw-h3/README_feature_agl-refhw-h3.md b/templates/feature/agl-refhw-h3/README_feature_agl-refhw-h3.md
new file mode 100644
index 000000000..57720bef1
--- /dev/null
+++ b/templates/feature/agl-refhw-h3/README_feature_agl-refhw-h3.md
@@ -0,0 +1,8 @@
+---
+description: AGL H3-based reference hardware support
+authors: Scott Murray <scott.murray@konsulko.com>
+---
+
+### Feature agl-refhw-h3
+
+Enable support for AGL H3-based reference hardware. Should only be used with "h3ulcb" or "h3ulcb-nogfx" machine types.
diff --git a/templates/feature/agl-selinux/50_bblayers.conf.inc b/templates/feature/agl-selinux/50_bblayers.conf.inc
new file mode 100644
index 000000000..b17e292e9
--- /dev/null
+++ b/templates/feature/agl-selinux/50_bblayers.conf.inc
@@ -0,0 +1,5 @@
+AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python"
+
+BBLAYERS =+ " \
+ ${METADIR}/external/meta-selinux \
+ "
diff --git a/templates/feature/agl-selinux/50_local.conf.inc b/templates/feature/agl-selinux/50_local.conf.inc
new file mode 100644
index 000000000..4aaac2d14
--- /dev/null
+++ b/templates/feature/agl-selinux/50_local.conf.inc
@@ -0,0 +1,2 @@
+#see meta-agl/meta-agl/conf/include/agl-selinux.inc
+require conf/include/agl-selinux.inc
diff --git a/templates/feature/agl-selinux/README_feature_agl-selinux.md b/templates/feature/agl-selinux/README_feature_agl-selinux.md
new file mode 100644
index 000000000..c48ce06b0
--- /dev/null
+++ b/templates/feature/agl-selinux/README_feature_agl-selinux.md
@@ -0,0 +1,9 @@
+---
+description: Feature agl-selinux
+authors: Scott Murray <scott.murray@konsulko.com>
+---
+
+### Feature agl-selinux
+
+Enables building with SELinux enabled, with the default mode
+being permissive.
diff --git a/templates/feature/agl-sign-wgts/50_local.conf.inc b/templates/feature/agl-sign-wgts/50_local.conf.inc
deleted file mode 100644
index fb1f6ab1a..000000000
--- a/templates/feature/agl-sign-wgts/50_local.conf.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-#see meta-agl/meta-agl/conf/include/agl-sign-wgts.inc
-require conf/include/agl-sign-wgts.inc
diff --git a/templates/feature/agl-sign-wgts/README_feature_agl-sign-wgts.md b/templates/feature/agl-sign-wgts/README_feature_agl-sign-wgts.md
deleted file mode 100644
index 5e3b4b12c..000000000
--- a/templates/feature/agl-sign-wgts/README_feature_agl-sign-wgts.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-description: Feature agl-sign-wgts
-authors: José Bollo <jose.bollo@iot.bzh>,
----
-
-### Feature agl-sign-wgts
-
-Activation of the signature of wgt files
diff --git a/templates/feature/agl-sota/50_bblayers.conf.inc b/templates/feature/agl-sota/50_bblayers.conf.inc
deleted file mode 100644
index f3623354c..000000000
--- a/templates/feature/agl-sota/50_bblayers.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-BBLAYERS =+ " \
- ${METADIR}/external/meta-updater \
- "
diff --git a/templates/feature/agl-sota/50_local.conf.inc b/templates/feature/agl-sota/50_local.conf.inc
deleted file mode 100644
index 3ceb04df7..000000000
--- a/templates/feature/agl-sota/50_local.conf.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-# See meta-updater/conf/distro/sota.conf.inc
-INHERIT += "sota"
-DISTRO_FEATURES_append = " sota usrmerge"
-DISTRO_FEATURES_NATIVE_append = " sota"
-AGL_DEFAULT_INITRAMFS_FSTYPES = "cpio.gz"
-# Netboot is not obeying usrmerge distro feature
-# therefore it is not compatible with agl-sota
-CONFLICT_DISTRO_FEATURES += "netboot"
diff --git a/templates/feature/agl-sota/50_setup.sh b/templates/feature/agl-sota/50_setup.sh
deleted file mode 100644
index f209b9442..000000000
--- a/templates/feature/agl-sota/50_setup.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-
-cat <<EOF >> ${BUILDDIR}/conf/bblayers.conf
-
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# fragment {
-# ${METADIR}/meta-agl/templates/feature/agl-sota/50_setup.sh
-#
-EOF
-
-case ${MACHINE} in
- "qemux86-64")
- echo "BBLAYERS =+ \"\${METADIR}/external/meta-updater-qemux86-64\"" >> ${BUILDDIR}/conf/bblayers.conf;;
- "raspberrypi3" | "raspberrypi4")
- echo "BBLAYERS =+ \"\${METADIR}/external/meta-updater-raspberrypi\"" >> ${BUILDDIR}/conf/bblayers.conf;;
- *)
- echo "#No extra SOTA feature layer for MACHINE ${MACHINE}" >> ${BUILDDIR}/conf/bblayers.conf;;
-esac
-
-
-cat <<EOF >> ${BUILDDIR}/conf/bblayers.conf
-
-#
-# }
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-
-EOF
diff --git a/templates/feature/agl-sota/README_feature_agl-sota.md b/templates/feature/agl-sota/README_feature_agl-sota.md
deleted file mode 100644
index beeffc234..000000000
--- a/templates/feature/agl-sota/README_feature_agl-sota.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-description: Feature agl-sota
-authors: Anton Gerasimov <anton@advancedtelematic.com>, Changhyeok Bae <changhyeok.bae@gmail.com>, Jan-Simon Moeller <jsmoeller@linuxfoundation.org>, Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Leon Anavi <leon.anavi@konsulko.com>, Phil Wise <phil@advancedtelematic.com>, Ronan Le Martret <ronan.lemartret@iot.bzh>
----
-
-### Feature agl-sota
-
-*Description is missing - please complete file meta-agl/templates/feature/agl-sota/README_feature_agl-sota.md*
-
diff --git a/templates/feature/agl-virt/50_bblayers.conf.inc b/templates/feature/agl-virt/50_bblayers.conf.inc
index 04d31a22d..65dc19580 100644
--- a/templates/feature/agl-virt/50_bblayers.conf.inc
+++ b/templates/feature/agl-virt/50_bblayers.conf.inc
@@ -1,3 +1,5 @@
-BBLAYERS =+ " \
- ${METADIR}/external/meta-virtualization \
- "
+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"
+
diff --git a/templates/feature/agl-virt/50_local.conf.inc b/templates/feature/agl-virt/50_local.conf.inc
index c15b8316b..8a7e44a71 100644
--- a/templates/feature/agl-virt/50_local.conf.inc
+++ b/templates/feature/agl-virt/50_local.conf.inc
@@ -1,3 +1,3 @@
# meta-virtualization needs the "virtualization in DISTRO_FEATURES
-DISTRO_FEATURES_append = " virtualization"
+DISTRO_FEATURES:append = " virtualization"
diff --git a/templates/feature/agl-weston-remoting/50_local.conf.inc b/templates/feature/agl-weston-remoting/50_local.conf.inc
index da1ddb3a0..63e0a984a 100644
--- a/templates/feature/agl-weston-remoting/50_local.conf.inc
+++ b/templates/feature/agl-weston-remoting/50_local.conf.inc
@@ -1 +1 @@
-DISTRO_FEATURES_append = " weston-remoting"
+DISTRO_FEATURES:append = " weston-remoting"
diff --git a/templates/feature/agl-weston-remoting/included.dep b/templates/feature/agl-weston-remoting/included.dep
index 032609b8a..82639da07 100644
--- a/templates/feature/agl-weston-remoting/included.dep
+++ b/templates/feature/agl-weston-remoting/included.dep
@@ -1 +1 @@
-agl-profile-graphical
+agl-demo