meta-uhmi: propagate the app_id to UHMI FW nodesHEADmaster

To support gRPC for UHMI, rvgpu-renderer must register the app_id with
agl-compositor, and uhmi-agl-wm must use it to run gRPC commands.

After this commit, please set the same app_id to Json files below:
* app.json: set "app_id" key under "backend_params"
* initial_vscreen.json: set "APPID" key under "vsurface"
Then, the app_id is propagated from ula to uhmi-agl-wm and from ucl
to remote-virtio-gpu and gRPC can change layouts of apps.

Bug-AGL: SPEC-5356

Change-Id: Ie835b794f30b199675ff8901d551854ff721ebc8
Signed-off-by: Kenta <murakami.kenta002@jp.panasonic.com>

6 files changed, 10 insertions, 7 deletions

diff --git a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/app.json b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/app.json
index 4da7020d..488e1f4a 100644
--- a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/app.json
+++ b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/app.json
@@ -21,6 +21,7 @@
                 "command" : "/usr/bin/ucl-virtio-gpu-wl-recv",
                 "backend_params" : {
                     "ivi_surface_id" : 101000,
+                    "app_id" : "com.github.glmark2.glmark2",
                     "scanout_x" : 0,
                     "scanout_y" : 0,
                     "scanout_w" : 1920,
@@ -35,6 +36,7 @@
                 "command" : "/usr/bin/ucl-virtio-gpu-wl-recv",
                 "backend_params" : {
                     "ivi_surface_id" : 101000,
+                    "app_id" : "com.github.glmark2.glmark2",
                     "scanout_x" : 0,
                     "scanout_y" : 0,
                     "scanout_w" : 1920,
diff --git a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/initial_vscreen.json b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/initial_vscreen.json
index d6ac7771..766de472 100644
--- a/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/initial_vscreen.json
+++ b/meta-uhmi/meta-agl-uhmi-demo/recipes-config/uhmi-config/files/initial_vscreen.json
@@ -10,6 +10,7 @@
       "vsurface": [
         {
           "VID": 101000,
+          "APPID": "com.github.glmark2.glmark2",
           "pixel_w": 1920, "pixel_h": 1080,
           "psrc_x": 0, "psrc_y": 0, "psrc_w": 1920, "psrc_h": 1080,
           "vdst_x": 0, "vdst_y": 0, "vdst_w": 1920, "vdst_h": 1080
diff --git a/meta-uhmi/recipes-core/ucl-tools/ucl-tools_git.bb b/meta-uhmi/recipes-core/ucl-tools/ucl-tools_git.bb
index 2c3111d7..bb24cd66 100644
--- a/meta-uhmi/recipes-core/ucl-tools/ucl-tools_git.bb
+++ b/meta-uhmi/recipes-core/ucl-tools/ucl-tools_git.bb
@@ -9,8 +9,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 PN="ucl-tools"
 PROVIDES += "ucl-tools"
 
-SRCREV = "80e83132834b5ab62875bc294332bd00cd559d5d"
-BRANCH ?= "main"
+SRCREV = "8a95c5412ff90507e33f9c5d4e57e3a5b4bb7205"
+BRANCH ?= "agl"
 SRC_URI = " \
     git://github.com/unified-hmi/ucl-tools.git;protocol=https;branch=${BRANCH} \
 "
diff --git a/meta-uhmi/recipes-core/uhmi-agl-wm/uhmi-agl-wm_git.bb b/meta-uhmi/recipes-core/uhmi-agl-wm/uhmi-agl-wm_git.bb
index f1aab6af..2329c0be 100644
--- a/meta-uhmi/recipes-core/uhmi-agl-wm/uhmi-agl-wm_git.bb
+++ b/meta-uhmi/recipes-core/uhmi-agl-wm/uhmi-agl-wm_git.bb
@@ -10,7 +10,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 PN="uhmi-agl-wm"
 
-SRCREV = "332c9f0b5fa2e2ee91d7f12331621a63759b6ae0"
+SRCREV = "20c1228834f141bbbb6c0ee71d4f3c4149f87b66"
 BRANCH ?= "master"
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/uhmi-agl-wm.git;protocol=https;branch=${AGL_BRANCH}"
 PV = "0.0+git${SRCPV}"
diff --git a/meta-uhmi/recipes-core/ula-tools/ula-tools-agl_git.bb b/meta-uhmi/recipes-core/ula-tools/ula-tools-agl_git.bb
index f5d1c888..744bff4a 100644
--- a/meta-uhmi/recipes-core/ula-tools/ula-tools-agl_git.bb
+++ b/meta-uhmi/recipes-core/ula-tools/ula-tools-agl_git.bb
@@ -9,8 +9,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 PN="ula-tools-agl"
 PROVIDES += "ula-tools-agl"
 
-SRCREV = "4403efd88fd4e79b092787ac727afe996dd7ca12"
-BRANCH ?= "main"
+SRCREV = "3591690087d8267a79d3d0714ef5f4abc4bffc8d"
+BRANCH ?= "agl"
 SRC_URI = " \
     git://github.com/unified-hmi/ula-tools.git;protocol=https;branch=${BRANCH} \
 "
diff --git a/meta-uhmi/recipes-graphics/remote-virtio-gpu/remote-virtio-gpu.inc b/meta-uhmi/recipes-graphics/remote-virtio-gpu/remote-virtio-gpu.inc
index ddd6dbab..47866ca6 100644
--- a/meta-uhmi/recipes-graphics/remote-virtio-gpu/remote-virtio-gpu.inc
+++ b/meta-uhmi/recipes-graphics/remote-virtio-gpu/remote-virtio-gpu.inc
@@ -1,6 +1,6 @@
 PV = "0.0+git${SRCPV}"
-SRCREV = "bce1f77f189dacf3e57d2f4edc37be4ff63b9e4b"
-BRANCH ?= "main"
+SRCREV = "f9e5d64f61a646849a835232998f6cf079176fb3"
+BRANCH ?= "agl"
 SRC_URI = " \
     git://github.com/unified-hmi/remote-virtio-gpu.git;protocol=https;branch=${BRANCH} \
 "