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

diff --git a/meta-agl-html5-demo/conf/layer.conf b/meta-agl-html5-demo/conf/layer.conf
new file mode 100644 (file)
index 0000000..cc5f23b
--- /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
similarity index 100%
rename from recipes-core/nss/nss-agl-driver-db/nss-agl-driver-db.service
rename to 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
similarity index 100%
rename from recipes-core/nss/nss-agl-driver-db/nss-agl-driver-db.sh
rename to 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
similarity index 100%
rename from recipes-core/nss/nss-agl-driver-db_git.bb
rename to 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
similarity index 96%
rename from recipes-demo/html5-background/html5-background_git.bb
rename to meta-agl-html5-demo/recipes-demo/html5-background/html5-background_git.bb
index c848710..9c35050 100644 (file)
--- 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
similarity index 96%
rename from recipes-demo/html5-dashboard/html5-dashboard_git.bb
rename to meta-agl-html5-demo/recipes-demo/html5-dashboard/html5-dashboard_git.bb
index 586627c..b903775 100644 (file)
--- 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
similarity index 100%
rename from recipes-demo/html5-homescreen/files/homescreen.service
rename to 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
similarity index 97%
rename from recipes-demo/html5-homescreen/html5-homescreen_git.bb
rename to meta-agl-html5-demo/recipes-demo/html5-homescreen/html5-homescreen_git.bb
index 2c46b95..8638c75 100644 (file)
--- 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
similarity index 94%
rename from recipes-demo/html5-hvac/html5-hvac_git.bb
rename to meta-agl-html5-demo/recipes-demo/html5-hvac/html5-hvac_git.bb
index c0d4c54..785d9b6 100644 (file)
--- 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
similarity index 96%
rename from recipes-demo/html5-launcher/html5-launcher_git.bb
rename to meta-agl-html5-demo/recipes-demo/html5-launcher/html5-launcher_git.bb
index cc9143c..f717f9e 100644 (file)
--- 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
similarity index 96%
rename from recipes-demo/html5-mediaplayer/html5-mediaplayer_git.bb
rename to meta-agl-html5-demo/recipes-demo/html5-mediaplayer/html5-mediaplayer_git.bb
index c178052..b7b25c2 100644 (file)
--- 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
similarity index 94%
rename from recipes-demo/html5-mixer/html5-mixer_git.bb
rename to meta-agl-html5-demo/recipes-demo/html5-mixer/html5-mixer_git.bb
index fe45ef1..c7957b3 100644 (file)
--- 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
similarity index 96%
rename from recipes-demo/html5-settings/html5-settings_git.bb
rename to meta-agl-html5-demo/recipes-demo/html5-settings/html5-settings_git.bb
index ff94276..a5ec625 100644 (file)
--- 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
similarity index 100%
rename from recipes-demo/webapp-samples/files/appinfo-aquarium.json
rename to 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
similarity index 100%
rename from recipes-demo/webapp-samples/files/appinfo-examples.json
rename to 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
similarity index 100%
rename from recipes-demo/webapp-samples/files/appinfo-jitsi.json
rename to 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
similarity index 100%
rename from recipes-demo/webapp-samples/files/appinfo-youtube.json
rename to 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
similarity index 100%
rename from recipes-demo/webapp-samples/html5-aquarium_git.bb
rename to 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
similarity index 100%
rename from recipes-demo/webapp-samples/html5-examples_git.bb
rename to 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
similarity index 100%
rename from recipes-demo/webapp-samples/html5-jitsi_git.bb
rename to 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
similarity index 100%
rename from recipes-demo/webapp-samples/html5-youtube_git.bb
rename to 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
similarity index 100%
rename from recipes-demo/webapp-samples/webapp-samples.inc
rename to 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
similarity index 83%
rename from recipes-platform/images/agl-ivi-demo-html5.bb
rename to meta-agl-html5-demo/recipes-platform/images/agl-ivi-demo-html5.bb
index 1141efc..62d43ff 100644 (file)
--- 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
similarity index 100%
rename from recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb
rename to 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
similarity index 100%
rename from recipes-support/icu/icu_74-%.bbappend
rename to 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
similarity index 100%
rename from recipes-support/icu/icu_74-1_agldemo.inc
rename to 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
similarity index 100%
rename from recipes-wam/cef/cef_git.bb
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/cef/0001-Add-an-option-to-use-an-output-directory-outside-src.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/cef/0002-Add-an-option-to-override-the-default-distrib-direct.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/cef/0003-Add-an-option-to-use-an-alternative-base-output-dire.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/cef/0004-Add-an-option-to-bypass-sysroot-checking-and-force.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/cef/0005-Add-AGL-wayland-window-related-calls.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/cef/0006-Add-a-method-to-check-if-the-agl-window-is-configure.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/cef/0007-Add-the-SetActivateRegion-method.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/cef/0008-Allow-passing-the-app_id-on-widget-creation.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/cef/0009-Update-generated-api.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/cef/0010-Make-patcher-work-outside-a-git-checkout.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/cef/0011-Avoid-the-RuntimeError-dictionary-changed-size-durin.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0001-agl-compositor-Add-agl_shell_wrapper-AGL-wayland-ext.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0002-agl-Add-waylandwindow-window-tree-host-essential-par.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0003-agl-Only-bind-to-agl_shell-if-it-s-the-browser-proce.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0004-agl-Add-a-method-to-check-if-the-agl-window-is-confi.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0005-agl-Start-using-agl-shell-version-4.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0006-agl-Don-t-use-DRI-for-renesas.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0007-meta-browser-Remove-the-GN-settings-done-for-clang-t.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0008-meta-browser-Pass-no-static-libstdc-to-gen.py.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0009-meta-browser-IWYU-Add-includes-for-size_t-and-int64_.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0010-meta-browser-BUILD-do-not-specify-march-on-arm.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0011-meta-browser-Avoid-parenthesized-initialization-of-a.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0012-meta-browser-Fix-constexpr-variable-cannot-have-non-.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0013-meta-browser-Add-missing-typename-s.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0014-meta-browser-Avoid-std-ranges-find_if.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0015-meta-browser-Avoid-capturing-structured-bindings.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0016-meta-browser-Delete-compiler-options-not-available-i.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0017-meta-browser-Don-t-pass-disable-auto-upgrade-debug-i.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0018-meta-browser-Fix-undefined-symbol-PaintOpWriter-Seri.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0019-upstream-Initialize-ServerCvc-with-designated-initia.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0020-M118-fix-Don-t-look-for-depot_tools-in-chrommium-s-t.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0021-M118-fix-Add-multiple-missing-includes.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0022-M118-fix-Fix-aggregate-initialization-in-trace_log.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0023-M118-fix-Add-missing-typename-keyword-in-multiple-st.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0024-M118-fix-Fix-comparison-in-HostResolverCache.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0025-M118-fix-Avoid-using-std-ranges-any_of-find_if-none_.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0026-M118-fix-Add-deleted-constructors-operators.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0027-M118-fix-Initialize-percentages-member-on-blink-Font.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0028-M118-fix-Don-t-delete-ZstdSourceStream-copy-move-cto.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0029-M118-fix-Fix-issue-with-structured-bindinds-captured.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0030-M118-fix-Only-default-arm_use_neon-to-true-if-its-va.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0031-M118-fix-Add-a-way-to-set-different-lib-paths-host-a.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0032-M118-fix-zlib-Fix-arm-build.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0033-M118-fix-Fix-skia-linker-issues-for-arm-neon.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/files/chromium/0034-v8-qemu-wrapper.patch
rename to 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
similarity index 100%
rename from recipes-wam/cef/gn-utils.inc
rename to 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
similarity index 100%
rename from recipes-wam/depot_tools/depot-tools-wam-native_git.bb
rename to 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
similarity index 100%
rename from recipes-wam/grpc-web-proxy/files/databroker-grpc-web-proxy.env
rename to 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
similarity index 100%
rename from recipes-wam/grpc-web-proxy/files/databroker-grpc-web-proxy.service
rename to 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
similarity index 100%
rename from recipes-wam/grpc-web-proxy/grpc-web-proxy_git.bb
rename to 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
similarity index 100%
rename from recipes-wam/wam/files/0001-agl-cef-Snapshot-with-all-patches-needed-to-enable-w.patch
rename to 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
similarity index 100%
rename from recipes-wam/wam/files/WebAppMgr-cef.env
rename to 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
similarity index 100%
rename from recipes-wam/wam/files/WebAppMgr.env
rename to 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
similarity index 100%
rename from recipes-wam/wam/files/WebAppMgr.service
rename to 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
similarity index 100%
rename from recipes-wam/wam/files/WebAppMgrCli
rename to 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
similarity index 100%
rename from recipes-wam/wam/wam-cef.inc
rename to 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
similarity index 100%
rename from recipes-wam/wam/wam_git.bb
rename to 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 (file)
index 0000000..de26d1f
--- /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 (file)
index 0000000..518c466
--- /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 (file)
index 0000000..82639da
--- /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 976a3fb..4e97632 100644 (file)
--- 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"