Move html5 demo into sublayer

The HTML5 demo needs additional fixes. Move it into a sublayer and activate with agl-demo-html5.

Bug-AGL: SPEC-5188
Change-Id: I2f1a07dcfbcaf7e09d4d0d3aec1aa8f096336287
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/30042
ci-image-build: Jenkins Job builder account
Tested-by: Jenkins Job builder account
Reviewed-by: Scott Murray <scott.murray@konsulko.com>
ci-image-boot-test: Jenkins Job builder account

88 files changed, 47 insertions, 10 deletions

diff --git a/meta-agl-html5-demo/conf/layer.conf b/meta-agl-html5-demo/conf/layer.conf
new file mode 100644
index 00000000..cc5f23b4
--- /dev/null
+++ b/meta-agl-html5-demo/conf/layer.conf
@@ -0,0 +1,15 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH =. "${LAYERDIR}:"
+
+# We have recipes-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "agl-html5-demo-layer"
+BBFILE_PATTERN_agl-html5-demo-layer = "^${LAYERDIR}/"
+BBFILE_PRIORITY_agl-html5-demo-layer = "70"
+
+LAYERSERIES_COMPAT_agl-html5-demo-layer = "scarthgap"
+
+LAYERDEPENDS_agl-html5-demo-layer = "agldemo"
+
diff --git a/recipes-core/nss/nss-agl-driver-db/nss-agl-driver-db.service b/meta-agl-html5-demo/recipes-core/nss/nss-agl-driver-db/nss-agl-driver-db.service
index 40818cf2..40818cf2 100644
--- a/recipes-core/nss/nss-agl-driver-db/nss-agl-driver-db.service
+++ b/meta-agl-html5-demo/recipes-core/nss/nss-agl-driver-db/nss-agl-driver-db.service
diff --git a/recipes-core/nss/nss-agl-driver-db/nss-agl-driver-db.sh b/meta-agl-html5-demo/recipes-core/nss/nss-agl-driver-db/nss-agl-driver-db.sh
index 1a8351bf..1a8351bf 100755
--- a/recipes-core/nss/nss-agl-driver-db/nss-agl-driver-db.sh
+++ b/meta-agl-html5-demo/recipes-core/nss/nss-agl-driver-db/nss-agl-driver-db.sh
diff --git a/recipes-core/nss/nss-agl-driver-db_git.bb b/meta-agl-html5-demo/recipes-core/nss/nss-agl-driver-db_git.bb
index b2fb4034..b2fb4034 100644
--- a/recipes-core/nss/nss-agl-driver-db_git.bb
+++ b/meta-agl-html5-demo/recipes-core/nss/nss-agl-driver-db_git.bb
diff --git a/recipes-demo/html5-background/html5-background_git.bb b/meta-agl-html5-demo/recipes-demo/html5-background/html5-background_git.bb
index c8487107..9c35050f 100644
--- a/recipes-demo/html5-background/html5-background_git.bb
+++ b/meta-agl-html5-demo/recipes-demo/html5-background/html5-background_git.bb
@@ -19,7 +19,7 @@ AGL_APP_TEMPLATE = "agl-app-web"
 AGL_APP_ID = "webapps-${BPN}"
 AGL_APP_NAME = "HTML5 Background"
 
-DEPENDS = "nodejs-native"
+DEPENDS = "nodejs-native icu-native"
 
 do_compile[network] = "1"
 do_compile() {
diff --git a/recipes-demo/html5-dashboard/html5-dashboard_git.bb b/meta-agl-html5-demo/recipes-demo/html5-dashboard/html5-dashboard_git.bb
index 586627c8..b9037753 100644
--- a/recipes-demo/html5-dashboard/html5-dashboard_git.bb
+++ b/meta-agl-html5-demo/recipes-demo/html5-dashboard/html5-dashboard_git.bb
@@ -19,7 +19,7 @@ AGL_APP_TEMPLATE = "agl-app-web"
 AGL_APP_ID = "webapps-dashboard"
 AGL_APP_NAME = "HTML5 Dashboard"
 
-DEPENDS = "nodejs-native"
+DEPENDS = "nodejs-native icu-native"
 
 do_compile[network] = "1"
 do_compile() {
diff --git a/recipes-demo/html5-homescreen/files/homescreen.service b/meta-agl-html5-demo/recipes-demo/html5-homescreen/files/homescreen.service
index b8d34caa..b8d34caa 100644
--- a/recipes-demo/html5-homescreen/files/homescreen.service
+++ b/meta-agl-html5-demo/recipes-demo/html5-homescreen/files/homescreen.service
diff --git a/recipes-demo/html5-homescreen/html5-homescreen_git.bb b/meta-agl-html5-demo/recipes-demo/html5-homescreen/html5-homescreen_git.bb
index 2c46b95a..8638c758 100644
--- a/recipes-demo/html5-homescreen/html5-homescreen_git.bb
+++ b/meta-agl-html5-demo/recipes-demo/html5-homescreen/html5-homescreen_git.bb
@@ -16,7 +16,7 @@ B       = "${WORKDIR}/build"
 
 inherit systemd
 
-DEPENDS = "nodejs-native"
+DEPENDS = "nodejs-native icu-native"
 
 do_compile[network] = "1"
 do_compile() {
diff --git a/recipes-demo/html5-hvac/html5-hvac_git.bb b/meta-agl-html5-demo/recipes-demo/html5-hvac/html5-hvac_git.bb
index c0d4c545..785d9b68 100644
--- a/recipes-demo/html5-hvac/html5-hvac_git.bb
+++ b/meta-agl-html5-demo/recipes-demo/html5-hvac/html5-hvac_git.bb
@@ -19,7 +19,7 @@ AGL_APP_TEMPLATE = "agl-app-web"
 AGL_APP_ID = "webapps-hvac"
 AGL_APP_NAME = "HTML5 HVAC"
 
-DEPENDS = "nodejs-native protobuf-native"
+DEPENDS = "nodejs-native protobuf-native icu-native"
 
 do_compile[network] = "1"
 do_compile() {
diff --git a/recipes-demo/html5-launcher/html5-launcher_git.bb b/meta-agl-html5-demo/recipes-demo/html5-launcher/html5-launcher_git.bb
index cc9143c2..f717f9e9 100644
--- a/recipes-demo/html5-launcher/html5-launcher_git.bb
+++ b/meta-agl-html5-demo/recipes-demo/html5-launcher/html5-launcher_git.bb
@@ -19,7 +19,7 @@ AGL_APP_TEMPLATE = "agl-app-web"
 AGL_APP_ID = "launcher"
 AGL_APP_NAME = "HTML5 Launcher"
 
-DEPENDS = "nodejs-native"
+DEPENDS = "nodejs-native icu-native"
 
 do_compile[network] = "1"
 do_compile() {
diff --git a/recipes-demo/html5-mediaplayer/html5-mediaplayer_git.bb b/meta-agl-html5-demo/recipes-demo/html5-mediaplayer/html5-mediaplayer_git.bb
index c1780529..b7b25c27 100644
--- a/recipes-demo/html5-mediaplayer/html5-mediaplayer_git.bb
+++ b/meta-agl-html5-demo/recipes-demo/html5-mediaplayer/html5-mediaplayer_git.bb
@@ -19,7 +19,7 @@ AGL_APP_TEMPLATE = "agl-app-web"
 AGL_APP_ID = "webapps-mediaplayer"
 AGL_APP_NAME = "HTML5 Media Player"
 
-DEPENDS = "nodejs-native"
+DEPENDS = "nodejs-native icu-native"
 
 do_compile[network] = "1"
 do_compile() {
diff --git a/recipes-demo/html5-mixer/html5-mixer_git.bb b/meta-agl-html5-demo/recipes-demo/html5-mixer/html5-mixer_git.bb
index fe45ef1a..c7957b3f 100644
--- a/recipes-demo/html5-mixer/html5-mixer_git.bb
+++ b/meta-agl-html5-demo/recipes-demo/html5-mixer/html5-mixer_git.bb
@@ -19,7 +19,7 @@ AGL_APP_TEMPLATE = "agl-app-web"
 AGL_APP_ID = "webapps-mixer"
 AGL_APP_NAME = "HTML5 Mixer"
 
-DEPENDS = "nodejs-native protobuf-native"
+DEPENDS = "nodejs-native protobuf-native icu-native"
 
 do_compile[network] = "1"
 do_compile() {
diff --git a/recipes-demo/html5-settings/html5-settings_git.bb b/meta-agl-html5-demo/recipes-demo/html5-settings/html5-settings_git.bb
index ff94276d..a5ec6252 100644
--- a/recipes-demo/html5-settings/html5-settings_git.bb
+++ b/meta-agl-html5-demo/recipes-demo/html5-settings/html5-settings_git.bb
@@ -19,7 +19,7 @@ AGL_APP_TEMPLATE = "agl-app-web"
 AGL_APP_ID = "webapps-settings"
 AGL_APP_NAME = "HTML5 Settings"
 
-DEPENDS = "nodejs-native"
+DEPENDS = "nodejs-native icu-native"
 
 do_compile[network] = "1"
 do_compile() {
diff --git a/recipes-demo/webapp-samples/files/appinfo-aquarium.json b/meta-agl-html5-demo/recipes-demo/webapp-samples/files/appinfo-aquarium.json
index 76fdd9e3..76fdd9e3 100644
--- a/recipes-demo/webapp-samples/files/appinfo-aquarium.json
+++ b/meta-agl-html5-demo/recipes-demo/webapp-samples/files/appinfo-aquarium.json
diff --git a/recipes-demo/webapp-samples/files/appinfo-examples.json b/meta-agl-html5-demo/recipes-demo/webapp-samples/files/appinfo-examples.json
index c1c960db..c1c960db 100644
--- a/recipes-demo/webapp-samples/files/appinfo-examples.json
+++ b/meta-agl-html5-demo/recipes-demo/webapp-samples/files/appinfo-examples.json
diff --git a/recipes-demo/webapp-samples/files/appinfo-jitsi.json b/meta-agl-html5-demo/recipes-demo/webapp-samples/files/appinfo-jitsi.json
index f5e1d808..f5e1d808 100644
--- a/recipes-demo/webapp-samples/files/appinfo-jitsi.json
+++ b/meta-agl-html5-demo/recipes-demo/webapp-samples/files/appinfo-jitsi.json
diff --git a/recipes-demo/webapp-samples/files/appinfo-youtube.json b/meta-agl-html5-demo/recipes-demo/webapp-samples/files/appinfo-youtube.json
index f844bf7a..f844bf7a 100644
--- a/recipes-demo/webapp-samples/files/appinfo-youtube.json
+++ b/meta-agl-html5-demo/recipes-demo/webapp-samples/files/appinfo-youtube.json
diff --git a/recipes-demo/webapp-samples/html5-aquarium_git.bb b/meta-agl-html5-demo/recipes-demo/webapp-samples/html5-aquarium_git.bb
index 0afc8514..0afc8514 100644
--- a/recipes-demo/webapp-samples/html5-aquarium_git.bb
+++ b/meta-agl-html5-demo/recipes-demo/webapp-samples/html5-aquarium_git.bb
diff --git a/recipes-demo/webapp-samples/html5-examples_git.bb b/meta-agl-html5-demo/recipes-demo/webapp-samples/html5-examples_git.bb
index c2b131af..c2b131af 100644
--- a/recipes-demo/webapp-samples/html5-examples_git.bb
+++ b/meta-agl-html5-demo/recipes-demo/webapp-samples/html5-examples_git.bb
diff --git a/recipes-demo/webapp-samples/html5-jitsi_git.bb b/meta-agl-html5-demo/recipes-demo/webapp-samples/html5-jitsi_git.bb
index e382cb03..e382cb03 100644
--- a/recipes-demo/webapp-samples/html5-jitsi_git.bb
+++ b/meta-agl-html5-demo/recipes-demo/webapp-samples/html5-jitsi_git.bb
diff --git a/recipes-demo/webapp-samples/html5-youtube_git.bb b/meta-agl-html5-demo/recipes-demo/webapp-samples/html5-youtube_git.bb
index 44a96440..44a96440 100644
--- a/recipes-demo/webapp-samples/html5-youtube_git.bb
+++ b/meta-agl-html5-demo/recipes-demo/webapp-samples/html5-youtube_git.bb
diff --git a/recipes-demo/webapp-samples/webapp-samples.inc b/meta-agl-html5-demo/recipes-demo/webapp-samples/webapp-samples.inc
index 1a74a46c..1a74a46c 100644
--- a/recipes-demo/webapp-samples/webapp-samples.inc
+++ b/meta-agl-html5-demo/recipes-demo/webapp-samples/webapp-samples.inc
diff --git a/recipes-platform/images/agl-ivi-demo-html5.bb b/meta-agl-html5-demo/recipes-platform/images/agl-ivi-demo-html5.bb
index 1141efc2..62d43ffb 100644
--- a/recipes-platform/images/agl-ivi-demo-html5.bb
+++ b/meta-agl-html5-demo/recipes-platform/images/agl-ivi-demo-html5.bb
@@ -1,4 +1,4 @@
-require agl-ivi-image.bb
+require recipes-platform/images/agl-ivi-image.bb
 
 SUMMARY = "AGL IVI demo HTML5 image"
 DESCRIPTION = "Contains the web runtime and sample web apps"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb b/meta-agl-html5-demo/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb
index c5a9209b..c5a9209b 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb
+++ b/meta-agl-html5-demo/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb
diff --git a/recipes-support/icu/icu_74-%.bbappend b/meta-agl-html5-demo/recipes-support/icu/icu_74-%.bbappend
index cf4061e9..cf4061e9 100644
--- a/recipes-support/icu/icu_74-%.bbappend
+++ b/meta-agl-html5-demo/recipes-support/icu/icu_74-%.bbappend
diff --git a/recipes-support/icu/icu_74-1_agldemo.inc b/meta-agl-html5-demo/recipes-support/icu/icu_74-1_agldemo.inc
index 957fe083..957fe083 100644
--- a/recipes-support/icu/icu_74-1_agldemo.inc
+++ b/meta-agl-html5-demo/recipes-support/icu/icu_74-1_agldemo.inc
diff --git a/recipes-wam/cef/cef_git.bb b/meta-agl-html5-demo/recipes-wam/cef/cef_git.bb
index 4a87631b..4a87631b 100644
--- a/recipes-wam/cef/cef_git.bb
+++ b/meta-agl-html5-demo/recipes-wam/cef/cef_git.bb
diff --git a/recipes-wam/cef/files/cef/0001-Add-an-option-to-use-an-output-directory-outside-src.patch b/meta-agl-html5-demo/recipes-wam/cef/files/cef/0001-Add-an-option-to-use-an-output-directory-outside-src.patch
index af2ea0ba..af2ea0ba 100644
--- a/recipes-wam/cef/files/cef/0001-Add-an-option-to-use-an-output-directory-outside-src.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/cef/0001-Add-an-option-to-use-an-output-directory-outside-src.patch
diff --git a/recipes-wam/cef/files/cef/0002-Add-an-option-to-override-the-default-distrib-direct.patch b/meta-agl-html5-demo/recipes-wam/cef/files/cef/0002-Add-an-option-to-override-the-default-distrib-direct.patch
index 0061c4d1..0061c4d1 100644
--- a/recipes-wam/cef/files/cef/0002-Add-an-option-to-override-the-default-distrib-direct.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/cef/0002-Add-an-option-to-override-the-default-distrib-direct.patch
diff --git a/recipes-wam/cef/files/cef/0003-Add-an-option-to-use-an-alternative-base-output-dire.patch b/meta-agl-html5-demo/recipes-wam/cef/files/cef/0003-Add-an-option-to-use-an-alternative-base-output-dire.patch
index 600d59dc..600d59dc 100644
--- a/recipes-wam/cef/files/cef/0003-Add-an-option-to-use-an-alternative-base-output-dire.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/cef/0003-Add-an-option-to-use-an-alternative-base-output-dire.patch
diff --git a/recipes-wam/cef/files/cef/0004-Add-an-option-to-bypass-sysroot-checking-and-force.patch b/meta-agl-html5-demo/recipes-wam/cef/files/cef/0004-Add-an-option-to-bypass-sysroot-checking-and-force.patch
index c5790744..c5790744 100644
--- a/recipes-wam/cef/files/cef/0004-Add-an-option-to-bypass-sysroot-checking-and-force.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/cef/0004-Add-an-option-to-bypass-sysroot-checking-and-force.patch
diff --git a/recipes-wam/cef/files/cef/0005-Add-AGL-wayland-window-related-calls.patch b/meta-agl-html5-demo/recipes-wam/cef/files/cef/0005-Add-AGL-wayland-window-related-calls.patch
index d717b817..d717b817 100644
--- a/recipes-wam/cef/files/cef/0005-Add-AGL-wayland-window-related-calls.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/cef/0005-Add-AGL-wayland-window-related-calls.patch
diff --git a/recipes-wam/cef/files/cef/0006-Add-a-method-to-check-if-the-agl-window-is-configure.patch b/meta-agl-html5-demo/recipes-wam/cef/files/cef/0006-Add-a-method-to-check-if-the-agl-window-is-configure.patch
index 0f5c4c5f..0f5c4c5f 100644
--- a/recipes-wam/cef/files/cef/0006-Add-a-method-to-check-if-the-agl-window-is-configure.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/cef/0006-Add-a-method-to-check-if-the-agl-window-is-configure.patch
diff --git a/recipes-wam/cef/files/cef/0007-Add-the-SetActivateRegion-method.patch b/meta-agl-html5-demo/recipes-wam/cef/files/cef/0007-Add-the-SetActivateRegion-method.patch
index e2d87065..e2d87065 100644
--- a/recipes-wam/cef/files/cef/0007-Add-the-SetActivateRegion-method.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/cef/0007-Add-the-SetActivateRegion-method.patch
diff --git a/recipes-wam/cef/files/cef/0008-Allow-passing-the-app_id-on-widget-creation.patch b/meta-agl-html5-demo/recipes-wam/cef/files/cef/0008-Allow-passing-the-app_id-on-widget-creation.patch
index e0a79b6c..e0a79b6c 100644
--- a/recipes-wam/cef/files/cef/0008-Allow-passing-the-app_id-on-widget-creation.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/cef/0008-Allow-passing-the-app_id-on-widget-creation.patch
diff --git a/recipes-wam/cef/files/cef/0009-Update-generated-api.patch b/meta-agl-html5-demo/recipes-wam/cef/files/cef/0009-Update-generated-api.patch
index aaf8dd14..aaf8dd14 100644
--- a/recipes-wam/cef/files/cef/0009-Update-generated-api.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/cef/0009-Update-generated-api.patch
diff --git a/recipes-wam/cef/files/cef/0010-Make-patcher-work-outside-a-git-checkout.patch b/meta-agl-html5-demo/recipes-wam/cef/files/cef/0010-Make-patcher-work-outside-a-git-checkout.patch
index a59b4f3c..a59b4f3c 100644
--- a/recipes-wam/cef/files/cef/0010-Make-patcher-work-outside-a-git-checkout.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/cef/0010-Make-patcher-work-outside-a-git-checkout.patch
diff --git a/recipes-wam/cef/files/cef/0011-Avoid-the-RuntimeError-dictionary-changed-size-durin.patch b/meta-agl-html5-demo/recipes-wam/cef/files/cef/0011-Avoid-the-RuntimeError-dictionary-changed-size-durin.patch
index 32527b79..32527b79 100644
--- a/recipes-wam/cef/files/cef/0011-Avoid-the-RuntimeError-dictionary-changed-size-durin.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/cef/0011-Avoid-the-RuntimeError-dictionary-changed-size-durin.patch
diff --git a/recipes-wam/cef/files/chromium/0001-agl-compositor-Add-agl_shell_wrapper-AGL-wayland-ext.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0001-agl-compositor-Add-agl_shell_wrapper-AGL-wayland-ext.patch
index 6ab4d5b8..6ab4d5b8 100644
--- a/recipes-wam/cef/files/chromium/0001-agl-compositor-Add-agl_shell_wrapper-AGL-wayland-ext.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0001-agl-compositor-Add-agl_shell_wrapper-AGL-wayland-ext.patch
diff --git a/recipes-wam/cef/files/chromium/0002-agl-Add-waylandwindow-window-tree-host-essential-par.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0002-agl-Add-waylandwindow-window-tree-host-essential-par.patch
index 488b398b..488b398b 100644
--- a/recipes-wam/cef/files/chromium/0002-agl-Add-waylandwindow-window-tree-host-essential-par.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0002-agl-Add-waylandwindow-window-tree-host-essential-par.patch
diff --git a/recipes-wam/cef/files/chromium/0003-agl-Only-bind-to-agl_shell-if-it-s-the-browser-proce.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0003-agl-Only-bind-to-agl_shell-if-it-s-the-browser-proce.patch
index 4de7779f..4de7779f 100644
--- a/recipes-wam/cef/files/chromium/0003-agl-Only-bind-to-agl_shell-if-it-s-the-browser-proce.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0003-agl-Only-bind-to-agl_shell-if-it-s-the-browser-proce.patch
diff --git a/recipes-wam/cef/files/chromium/0004-agl-Add-a-method-to-check-if-the-agl-window-is-confi.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0004-agl-Add-a-method-to-check-if-the-agl-window-is-confi.patch
index 398023ca..398023ca 100644
--- a/recipes-wam/cef/files/chromium/0004-agl-Add-a-method-to-check-if-the-agl-window-is-confi.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0004-agl-Add-a-method-to-check-if-the-agl-window-is-confi.patch
diff --git a/recipes-wam/cef/files/chromium/0005-agl-Start-using-agl-shell-version-4.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0005-agl-Start-using-agl-shell-version-4.patch
index 8b5a3812..8b5a3812 100644
--- a/recipes-wam/cef/files/chromium/0005-agl-Start-using-agl-shell-version-4.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0005-agl-Start-using-agl-shell-version-4.patch
diff --git a/recipes-wam/cef/files/chromium/0006-agl-Don-t-use-DRI-for-renesas.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0006-agl-Don-t-use-DRI-for-renesas.patch
index 1914661e..1914661e 100644
--- a/recipes-wam/cef/files/chromium/0006-agl-Don-t-use-DRI-for-renesas.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0006-agl-Don-t-use-DRI-for-renesas.patch
diff --git a/recipes-wam/cef/files/chromium/0007-meta-browser-Remove-the-GN-settings-done-for-clang-t.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0007-meta-browser-Remove-the-GN-settings-done-for-clang-t.patch
index 75d37ab1..75d37ab1 100644
--- a/recipes-wam/cef/files/chromium/0007-meta-browser-Remove-the-GN-settings-done-for-clang-t.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0007-meta-browser-Remove-the-GN-settings-done-for-clang-t.patch
diff --git a/recipes-wam/cef/files/chromium/0008-meta-browser-Pass-no-static-libstdc-to-gen.py.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0008-meta-browser-Pass-no-static-libstdc-to-gen.py.patch
index a31d4242..a31d4242 100644
--- a/recipes-wam/cef/files/chromium/0008-meta-browser-Pass-no-static-libstdc-to-gen.py.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0008-meta-browser-Pass-no-static-libstdc-to-gen.py.patch
diff --git a/recipes-wam/cef/files/chromium/0009-meta-browser-IWYU-Add-includes-for-size_t-and-int64_.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0009-meta-browser-IWYU-Add-includes-for-size_t-and-int64_.patch
index 8e46c2c5..8e46c2c5 100644
--- a/recipes-wam/cef/files/chromium/0009-meta-browser-IWYU-Add-includes-for-size_t-and-int64_.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0009-meta-browser-IWYU-Add-includes-for-size_t-and-int64_.patch
diff --git a/recipes-wam/cef/files/chromium/0010-meta-browser-BUILD-do-not-specify-march-on-arm.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0010-meta-browser-BUILD-do-not-specify-march-on-arm.patch
index 5936248e..5936248e 100644
--- a/recipes-wam/cef/files/chromium/0010-meta-browser-BUILD-do-not-specify-march-on-arm.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0010-meta-browser-BUILD-do-not-specify-march-on-arm.patch
diff --git a/recipes-wam/cef/files/chromium/0011-meta-browser-Avoid-parenthesized-initialization-of-a.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0011-meta-browser-Avoid-parenthesized-initialization-of-a.patch
index dbdda920..dbdda920 100644
--- a/recipes-wam/cef/files/chromium/0011-meta-browser-Avoid-parenthesized-initialization-of-a.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0011-meta-browser-Avoid-parenthesized-initialization-of-a.patch
diff --git a/recipes-wam/cef/files/chromium/0012-meta-browser-Fix-constexpr-variable-cannot-have-non-.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0012-meta-browser-Fix-constexpr-variable-cannot-have-non-.patch
index 3a91c1dd..3a91c1dd 100644
--- a/recipes-wam/cef/files/chromium/0012-meta-browser-Fix-constexpr-variable-cannot-have-non-.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0012-meta-browser-Fix-constexpr-variable-cannot-have-non-.patch
diff --git a/recipes-wam/cef/files/chromium/0013-meta-browser-Add-missing-typename-s.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0013-meta-browser-Add-missing-typename-s.patch
index 8740b81a..8740b81a 100644
--- a/recipes-wam/cef/files/chromium/0013-meta-browser-Add-missing-typename-s.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0013-meta-browser-Add-missing-typename-s.patch
diff --git a/recipes-wam/cef/files/chromium/0014-meta-browser-Avoid-std-ranges-find_if.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0014-meta-browser-Avoid-std-ranges-find_if.patch
index 2bd12fae..2bd12fae 100644
--- a/recipes-wam/cef/files/chromium/0014-meta-browser-Avoid-std-ranges-find_if.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0014-meta-browser-Avoid-std-ranges-find_if.patch
diff --git a/recipes-wam/cef/files/chromium/0015-meta-browser-Avoid-capturing-structured-bindings.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0015-meta-browser-Avoid-capturing-structured-bindings.patch
index 7b612b84..7b612b84 100644
--- a/recipes-wam/cef/files/chromium/0015-meta-browser-Avoid-capturing-structured-bindings.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0015-meta-browser-Avoid-capturing-structured-bindings.patch
diff --git a/recipes-wam/cef/files/chromium/0016-meta-browser-Delete-compiler-options-not-available-i.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0016-meta-browser-Delete-compiler-options-not-available-i.patch
index 0956f5f3..0956f5f3 100644
--- a/recipes-wam/cef/files/chromium/0016-meta-browser-Delete-compiler-options-not-available-i.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0016-meta-browser-Delete-compiler-options-not-available-i.patch
diff --git a/recipes-wam/cef/files/chromium/0017-meta-browser-Don-t-pass-disable-auto-upgrade-debug-i.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0017-meta-browser-Don-t-pass-disable-auto-upgrade-debug-i.patch
index 48f722e8..48f722e8 100644
--- a/recipes-wam/cef/files/chromium/0017-meta-browser-Don-t-pass-disable-auto-upgrade-debug-i.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0017-meta-browser-Don-t-pass-disable-auto-upgrade-debug-i.patch
diff --git a/recipes-wam/cef/files/chromium/0018-meta-browser-Fix-undefined-symbol-PaintOpWriter-Seri.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0018-meta-browser-Fix-undefined-symbol-PaintOpWriter-Seri.patch
index 2c953d3b..2c953d3b 100644
--- a/recipes-wam/cef/files/chromium/0018-meta-browser-Fix-undefined-symbol-PaintOpWriter-Seri.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0018-meta-browser-Fix-undefined-symbol-PaintOpWriter-Seri.patch
diff --git a/recipes-wam/cef/files/chromium/0019-upstream-Initialize-ServerCvc-with-designated-initia.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0019-upstream-Initialize-ServerCvc-with-designated-initia.patch
index aba25502..aba25502 100644
--- a/recipes-wam/cef/files/chromium/0019-upstream-Initialize-ServerCvc-with-designated-initia.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0019-upstream-Initialize-ServerCvc-with-designated-initia.patch
diff --git a/recipes-wam/cef/files/chromium/0020-M118-fix-Don-t-look-for-depot_tools-in-chrommium-s-t.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0020-M118-fix-Don-t-look-for-depot_tools-in-chrommium-s-t.patch
index a8c01ab0..a8c01ab0 100644
--- a/recipes-wam/cef/files/chromium/0020-M118-fix-Don-t-look-for-depot_tools-in-chrommium-s-t.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0020-M118-fix-Don-t-look-for-depot_tools-in-chrommium-s-t.patch
diff --git a/recipes-wam/cef/files/chromium/0021-M118-fix-Add-multiple-missing-includes.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0021-M118-fix-Add-multiple-missing-includes.patch
index df307082..df307082 100644
--- a/recipes-wam/cef/files/chromium/0021-M118-fix-Add-multiple-missing-includes.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0021-M118-fix-Add-multiple-missing-includes.patch
diff --git a/recipes-wam/cef/files/chromium/0022-M118-fix-Fix-aggregate-initialization-in-trace_log.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0022-M118-fix-Fix-aggregate-initialization-in-trace_log.patch
index 39e5c605..39e5c605 100644
--- a/recipes-wam/cef/files/chromium/0022-M118-fix-Fix-aggregate-initialization-in-trace_log.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0022-M118-fix-Fix-aggregate-initialization-in-trace_log.patch
diff --git a/recipes-wam/cef/files/chromium/0023-M118-fix-Add-missing-typename-keyword-in-multiple-st.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0023-M118-fix-Add-missing-typename-keyword-in-multiple-st.patch
index ea0b2c59..ea0b2c59 100644
--- a/recipes-wam/cef/files/chromium/0023-M118-fix-Add-missing-typename-keyword-in-multiple-st.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0023-M118-fix-Add-missing-typename-keyword-in-multiple-st.patch
diff --git a/recipes-wam/cef/files/chromium/0024-M118-fix-Fix-comparison-in-HostResolverCache.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0024-M118-fix-Fix-comparison-in-HostResolverCache.patch
index ab487339..ab487339 100644
--- a/recipes-wam/cef/files/chromium/0024-M118-fix-Fix-comparison-in-HostResolverCache.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0024-M118-fix-Fix-comparison-in-HostResolverCache.patch
diff --git a/recipes-wam/cef/files/chromium/0025-M118-fix-Avoid-using-std-ranges-any_of-find_if-none_.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0025-M118-fix-Avoid-using-std-ranges-any_of-find_if-none_.patch
index fff1423e..fff1423e 100644
--- a/recipes-wam/cef/files/chromium/0025-M118-fix-Avoid-using-std-ranges-any_of-find_if-none_.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0025-M118-fix-Avoid-using-std-ranges-any_of-find_if-none_.patch
diff --git a/recipes-wam/cef/files/chromium/0026-M118-fix-Add-deleted-constructors-operators.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0026-M118-fix-Add-deleted-constructors-operators.patch
index 06106360..06106360 100644
--- a/recipes-wam/cef/files/chromium/0026-M118-fix-Add-deleted-constructors-operators.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0026-M118-fix-Add-deleted-constructors-operators.patch
diff --git a/recipes-wam/cef/files/chromium/0027-M118-fix-Initialize-percentages-member-on-blink-Font.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0027-M118-fix-Initialize-percentages-member-on-blink-Font.patch
index 9d7e30eb..9d7e30eb 100644
--- a/recipes-wam/cef/files/chromium/0027-M118-fix-Initialize-percentages-member-on-blink-Font.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0027-M118-fix-Initialize-percentages-member-on-blink-Font.patch
diff --git a/recipes-wam/cef/files/chromium/0028-M118-fix-Don-t-delete-ZstdSourceStream-copy-move-cto.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0028-M118-fix-Don-t-delete-ZstdSourceStream-copy-move-cto.patch
index d387b67c..d387b67c 100644
--- a/recipes-wam/cef/files/chromium/0028-M118-fix-Don-t-delete-ZstdSourceStream-copy-move-cto.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0028-M118-fix-Don-t-delete-ZstdSourceStream-copy-move-cto.patch
diff --git a/recipes-wam/cef/files/chromium/0029-M118-fix-Fix-issue-with-structured-bindinds-captured.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0029-M118-fix-Fix-issue-with-structured-bindinds-captured.patch
index fec15dd8..fec15dd8 100644
--- a/recipes-wam/cef/files/chromium/0029-M118-fix-Fix-issue-with-structured-bindinds-captured.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0029-M118-fix-Fix-issue-with-structured-bindinds-captured.patch
diff --git a/recipes-wam/cef/files/chromium/0030-M118-fix-Only-default-arm_use_neon-to-true-if-its-va.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0030-M118-fix-Only-default-arm_use_neon-to-true-if-its-va.patch
index 08a2db60..08a2db60 100644
--- a/recipes-wam/cef/files/chromium/0030-M118-fix-Only-default-arm_use_neon-to-true-if-its-va.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0030-M118-fix-Only-default-arm_use_neon-to-true-if-its-va.patch
diff --git a/recipes-wam/cef/files/chromium/0031-M118-fix-Add-a-way-to-set-different-lib-paths-host-a.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0031-M118-fix-Add-a-way-to-set-different-lib-paths-host-a.patch
index fa049e1b..fa049e1b 100644
--- a/recipes-wam/cef/files/chromium/0031-M118-fix-Add-a-way-to-set-different-lib-paths-host-a.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0031-M118-fix-Add-a-way-to-set-different-lib-paths-host-a.patch
diff --git a/recipes-wam/cef/files/chromium/0032-M118-fix-zlib-Fix-arm-build.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0032-M118-fix-zlib-Fix-arm-build.patch
index 3c2b3a77..3c2b3a77 100644
--- a/recipes-wam/cef/files/chromium/0032-M118-fix-zlib-Fix-arm-build.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0032-M118-fix-zlib-Fix-arm-build.patch
diff --git a/recipes-wam/cef/files/chromium/0033-M118-fix-Fix-skia-linker-issues-for-arm-neon.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0033-M118-fix-Fix-skia-linker-issues-for-arm-neon.patch
index 57f713b2..57f713b2 100644
--- a/recipes-wam/cef/files/chromium/0033-M118-fix-Fix-skia-linker-issues-for-arm-neon.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0033-M118-fix-Fix-skia-linker-issues-for-arm-neon.patch
diff --git a/recipes-wam/cef/files/chromium/0034-v8-qemu-wrapper.patch b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0034-v8-qemu-wrapper.patch
index dec3db35..dec3db35 100644
--- a/recipes-wam/cef/files/chromium/0034-v8-qemu-wrapper.patch
+++ b/meta-agl-html5-demo/recipes-wam/cef/files/chromium/0034-v8-qemu-wrapper.patch
diff --git a/recipes-wam/cef/gn-utils.inc b/meta-agl-html5-demo/recipes-wam/cef/gn-utils.inc
index 34f8a12c..34f8a12c 100644
--- a/recipes-wam/cef/gn-utils.inc
+++ b/meta-agl-html5-demo/recipes-wam/cef/gn-utils.inc
diff --git a/recipes-wam/depot_tools/depot-tools-wam-native_git.bb b/meta-agl-html5-demo/recipes-wam/depot_tools/depot-tools-wam-native_git.bb
index 9a466bb3..9a466bb3 100644
--- a/recipes-wam/depot_tools/depot-tools-wam-native_git.bb
+++ b/meta-agl-html5-demo/recipes-wam/depot_tools/depot-tools-wam-native_git.bb
diff --git a/recipes-wam/grpc-web-proxy/files/databroker-grpc-web-proxy.env b/meta-agl-html5-demo/recipes-wam/grpc-web-proxy/files/databroker-grpc-web-proxy.env
index 1435253d..1435253d 100644
--- a/recipes-wam/grpc-web-proxy/files/databroker-grpc-web-proxy.env
+++ b/meta-agl-html5-demo/recipes-wam/grpc-web-proxy/files/databroker-grpc-web-proxy.env
diff --git a/recipes-wam/grpc-web-proxy/files/databroker-grpc-web-proxy.service b/meta-agl-html5-demo/recipes-wam/grpc-web-proxy/files/databroker-grpc-web-proxy.service
index ff6afe44..ff6afe44 100644
--- a/recipes-wam/grpc-web-proxy/files/databroker-grpc-web-proxy.service
+++ b/meta-agl-html5-demo/recipes-wam/grpc-web-proxy/files/databroker-grpc-web-proxy.service
diff --git a/recipes-wam/grpc-web-proxy/grpc-web-proxy_git.bb b/meta-agl-html5-demo/recipes-wam/grpc-web-proxy/grpc-web-proxy_git.bb
index dfb763b6..dfb763b6 100644
--- a/recipes-wam/grpc-web-proxy/grpc-web-proxy_git.bb
+++ b/meta-agl-html5-demo/recipes-wam/grpc-web-proxy/grpc-web-proxy_git.bb
diff --git a/recipes-wam/wam/files/0001-agl-cef-Snapshot-with-all-patches-needed-to-enable-w.patch b/meta-agl-html5-demo/recipes-wam/wam/files/0001-agl-cef-Snapshot-with-all-patches-needed-to-enable-w.patch
index 65c2e7c6..65c2e7c6 100644
--- a/recipes-wam/wam/files/0001-agl-cef-Snapshot-with-all-patches-needed-to-enable-w.patch
+++ b/meta-agl-html5-demo/recipes-wam/wam/files/0001-agl-cef-Snapshot-with-all-patches-needed-to-enable-w.patch
diff --git a/recipes-wam/wam/files/WebAppMgr-cef.env b/meta-agl-html5-demo/recipes-wam/wam/files/WebAppMgr-cef.env
index adc18b94..adc18b94 100644
--- a/recipes-wam/wam/files/WebAppMgr-cef.env
+++ b/meta-agl-html5-demo/recipes-wam/wam/files/WebAppMgr-cef.env
diff --git a/recipes-wam/wam/files/WebAppMgr.env b/meta-agl-html5-demo/recipes-wam/wam/files/WebAppMgr.env
index f1d0f28f..f1d0f28f 100644
--- a/recipes-wam/wam/files/WebAppMgr.env
+++ b/meta-agl-html5-demo/recipes-wam/wam/files/WebAppMgr.env
diff --git a/recipes-wam/wam/files/WebAppMgr.service b/meta-agl-html5-demo/recipes-wam/wam/files/WebAppMgr.service
index 5f025a18..5f025a18 100644
--- a/recipes-wam/wam/files/WebAppMgr.service
+++ b/meta-agl-html5-demo/recipes-wam/wam/files/WebAppMgr.service
diff --git a/recipes-wam/wam/files/WebAppMgrCli b/meta-agl-html5-demo/recipes-wam/wam/files/WebAppMgrCli
index 4312e047..4312e047 100755
--- a/recipes-wam/wam/files/WebAppMgrCli
+++ b/meta-agl-html5-demo/recipes-wam/wam/files/WebAppMgrCli
diff --git a/recipes-wam/wam/wam-cef.inc b/meta-agl-html5-demo/recipes-wam/wam/wam-cef.inc
index f0fdcd35..f0fdcd35 100644
--- a/recipes-wam/wam/wam-cef.inc
+++ b/meta-agl-html5-demo/recipes-wam/wam/wam-cef.inc
diff --git a/recipes-wam/wam/wam_git.bb b/meta-agl-html5-demo/recipes-wam/wam/wam_git.bb
index f76641e5..f76641e5 100644
--- a/recipes-wam/wam/wam_git.bb
+++ b/meta-agl-html5-demo/recipes-wam/wam/wam_git.bb
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 00000000..de26d1f9
--- /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 00000000..518c4667
--- /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 00000000..82639da0
--- /dev/null
+++ b/templates/feature/agl-demo-html5/included.dep
@@ -0,0 +1 @@
+agl-demo
diff --git a/templates/feature/agl-demo/50_bblayers.conf.inc b/templates/feature/agl-demo/50_bblayers.conf.inc
index 976a3fb8..4e97632a 100644
--- a/templates/feature/agl-demo/50_bblayers.conf.inc
+++ b/templates/feature/agl-demo/50_bblayers.conf.inc
@@ -12,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"