Unified HMI: Consolidate recipes under meta-uhmi

Move all recipes from meta-rvgpu and meta-distributed-display-fw
into meta-uhmi. And, document the build instructions for RVGPU and
DDFW in the README.

Bug-AGL: SPEC-5254

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

30 files changed, 396 insertions, 325 deletions

diff --git a/meta-uhmi/README.md b/meta-uhmi/README.md
index 8f824724..8aa79e4e 100644
--- a/meta-uhmi/README.md
+++ b/meta-uhmi/README.md
@@ -1,27 +1,27 @@
-## Unified HMI support layer (meta-uhmi)
-"Unified HMI" is a common platform technology for UX innovation in integrated cockpit by flexible information display on multiple displays of various applications. Applications can be rendered to any display via a unified virtual display.
+## Unified HMI Support Layer (meta-uhmi)
+"Unified HMI" is a common platform technology for UX innovation in integrated cockpits, by flexible information display on multiple displays of various applications. Applications can be rendered to any display via a unified virtual display.
 
 Unified HMI consists of two main components.
 
 * Remote Virtio GPU Device(RVGPU): Render applications remotely in different SoCs/VMs.
-* Distributed Display Framework: Flexible layout control of applications across multiple displays.
+* Distributed Display Framework(DDFW): Flexible layout control of applications across multiple displays.
 
 The meta-uhmi currently supports x86, Raspberry Pi4, and Renesas Boards platforms.
 There are two layers under meta-uhmi to support these two frameworks.
 
-## RVGPU support layer(meta-rvgpu)
+## Remote Virtio GPU Device(RVGPU)
 RVGPU rendering engine, operating on a client-server model, creates 3D rendering commands on a client device and transmits them to a server device via the network, where the server-side device performs GPU-based rendering and displays the results.
 
-The meta-rvgpu currently supports `agl-image-weston`, `agl-ivi-demo-qt`, `agl-ivi-demo-flutter` as build images.
+RVGPU currently supports the following images: `agl-image-weston`, `agl-ivi-demo-qt`, `agl-ivi-demo-flutter`
 
-RVGPU is OSS. For more details, visit the following URL: [Unified HMI - Remote Virtio GPU](https://github.com/unified-hmi/remote-virtio-gpu)
+RVGPU is open-source software (OSS). For more details, visit the [Unified HMI - Remote Virtio GPU](https://github.com/unified-hmi/remote-virtio-gpu).
 
-## Distributed Display Framework support layer(meta-distributed-display-fw)
-Distributed Display Framework is an open-source software layer that provides essential services for managing distributed display applications. This framework is designed to work with a variety of hardware and software configurations, making it a versatile choice for developers looking to create scalable and robust display solutions.
+## Distributed Display Framework(DDFW)
+DDFW is an open-source software layer that provides essential services for managing distributed display applications. This framework is designed to work with a variety of hardware and software configurations, making it a versatile choice for developers looking to create scalable and robust display solutions.
 
-Now, the meta-distributed-display-fw only supports build images that run on weston and for which the wayland-ivi-extension is available like `agl-image-weston`.
+Now, DDFW only supports build images that run on weston and for which the wayland-ivi-extension is available like `agl-image-weston`.
 
-Distributed Display Framework consists of three main components.
+DDFW consists of three main components:
 
 * [ucl-tools](https://github.com/unified-hmi/ucl-tools): Unified Clustering Tools (UCL), launch applications for multiple platforms and manage execution order and survival.
 
@@ -29,14 +29,23 @@ Distributed Display Framework consists of three main components.
 
 * [uhmi-ivi-wm](https://github.com/unified-hmi/uhmi-ivi-wm): apply ivi-layer and ivi-surface layouts to the screen using the layout design output by ula-tools.
 
-For more details about these frameworks, please visit our GitHub repository at the attached URL.
+For more details about these frameworks, please visit our GitHub repository.
 
 ## How to build
-Follow the [AGL documentation](https://docs.automotivelinux.org/en/master/#01_Getting_Started/02_Building_AGL_Image/01_Build_Process_Overview/) for the build process, and set up the "[Initializing Your Build Environment](https://docs.automotivelinux.org/en/master/#01_Getting_Started/02_Building_AGL_Image/04_Initializing_Your_Build_Environment/)" section as described below to enable the AGL feature 'agl-uhmi'. For example:
+Follow the [AGL documentation](https://docs.automotivelinux.org/en/master/#01_Getting_Started/02_Building_AGL_Image/01_Build_Process_Overview/) for the build process, and set up the "[Initializing Your Build Environment](https://docs.automotivelinux.org/en/master/#01_Getting_Started/02_Building_AGL_Image/04_Initializing_Your_Build_Environment/)" section as described below to enable the AGL feature 'agl-uhmi'. 
+
+For example:
 ```
 $ cd $AGL_TOP/master
 $ source ./meta-agl/scripts/aglsetup.sh -m qemux86-64 -b qemux86-64 agl-demo agl-devel agl-uhmi
 ```
+
+To add RVGPU and DDFW to the build images, please add the packagegroup that enable RVGPU(packagegroup-rvgpu) and DDFW(packagegroup-ddfw) to the installation target using the following command.
+```
+$ echo 'IMAGE_INSTALL:append = " packagegroup-rvgpu packagegroup-ddfw"' >> conf/local.conf
+```
+**Note**: RVGPU and DDFW can each be used independently. If you wish to use them individually, please add only one of the packagegroups to the installation target.
+
 After adding the feature, execute the command:
 ```
 $ bitbake <image_name>
@@ -44,13 +53,15 @@ $ bitbake <image_name>
 Replace the `<image_name>` with the appropriate values you want. We have confirmed the operation with the **agl-image-weston**.
 
 ## How to setup and boot
-For Environment setup instructions for each platform, refer to the following link in the AGL Documentation.
-[Building for x86(Emulation and Hardware)](https://docs.automotivelinux.org/en/master/#01_Getting_Started/02_Building_AGL_Image/07_Building_for_x86_%28Emulation_and_Hardware%29/)
-[Building for Raspberry Pi 4](https://docs.automotivelinux.org/en/master/#01_Getting_Started/02_Building_AGL_Image/08_Building_for_Raspberry_Pi_4/)
-[Building for Supported Renesas Boards](https://docs.automotivelinux.org/en/master/#01_Getting_Started/02_Building_AGL_Image/09_Building_for_Supported_Renesas_Boards/)
+For Environment setup instructions for each platform, refer to the following links in the AGL Documentation:
+[Building for x86(Emulation and Hardware)](https://docs.automotivelinux.org/en/master/#01_Getting_Started/02_Building_AGL_Image/06_Building_the_AGL_Image/02_Building_for_x86_%28Emulation_and_Hardware%29/)
+[Building for Raspberry Pi 4](https://docs.automotivelinux.org/en/master/#01_Getting_Started/02_Building_AGL_Image/06_Building_the_AGL_Image/03_Building_for_Raspberry_Pi_4/)
+[Building for Supported Renesas Boards](https://docs.automotivelinux.org/en/master/#01_Getting_Started/02_Building_AGL_Image/06_Building_the_AGL_Image/04_Building_for_Supported_Renesas_Boards/)
 
 For Raspberry Pi 4 and Supported Renesas Boards, refer to the above URL for boot methods.
-For x86 emulation (qemu), network bridge is required to enable communication with other devices when using RVGPU. Here’s an example procedure for your reference.
+For x86 emulation (qemu), network bridge is required to enable communication with other devices when using RVGPU. 
+
+Here’s an example procedure for your reference.
 ```
 $ sudo ip link add <bridge_name> type bridge
 $ sudo ip addr add <IP address> dev <bridge_name>
@@ -98,3 +109,366 @@ For example:
 ```
 ifconfig <your environment> 192.168.0.100 netmask 255.255.255.0
 ```
+
+## How to run RVGPU remotely
+Prepare two images, one as the Sender and the other as the Receiver.
+It is necessary for the Sender and Receiver to be within the same network.
+
+**Receiver side**  
+```
+$ export XDG_RUNTIME_DIR=/run/user/<your_UID>
+$ rvgpu-renderer -b <your_Area>@0,0 -p <Port_Number> &
+```
+
+Replace the placeholders with the appropriate values:
+- `<your_UID>`: Specify according to your environment, for example: 200
+- `<your_Area>`: Enter an usable area for example: 1920x1080  
+- `<Port_Number>`: Enter an available port number, for example: 55555
+
+**Sender side**  
+Create the following shell script **run_remote_app.sh** in any `<WORKDIR>` for a smooth experience.
+```
+#!/bin/bash
+
+export XDG_RUNTIME_DIR=/tmp
+export LD_LIBRARY_PATH=/usr/lib/mesa-virtio
+
+# -------------
+# launch app
+# -------------
+$@
+```
+
+Save the file and run the following to start weston.
+
+```
+$ rvgpu-proxy -s <your_Area>@0,0 -n <IP_address_of_Receiver>:<Port_Number> &
+$ EGLWINSYS_DRM_DEV_NAME=<RVGPU_DRM_DEVICE_PATH> <WORKDIR>/run_remote_app.sh rvgpu-wlproxy -s <your_Area> -S <your_WAYLAND_DISPLAY> &
+```  
+Replace the placeholders with the appropriate values:
+- `<Port_Number>`: Port set in the renderer.
+- `<your_WAYLAND_DISPLAY>`: Specify your WAYLAND_DISPLAY socket name, for example: wayland-uhmi-0
+- `<RVGPU_DRM_DEVICE_PATH>`: Specify rvgpu drm device path generated by rvgpu-proxy, for example: /dev/dri/rvgpu_virtio0
+
+After completing these steps, the Weston screen from the Sender will be transferred and displayed on the Receiver using rvgpu-proxy and rvgpu-renderer. You can verify that everything is functioning properly by launching wayland applications on the Sender side, such as:
+```
+$ WAYLAND_DISPLAY=<your_WAYLAND_DISPLAY> <WORKDIR>/run_remote_app.sh weston-simple-egl -f
+``` 
+
+You can also verify the touch or keyboard operation support of the RVGPU by using app such as 
+```
+$ WAYLAND_DISPLAY=<your_WAYLAND_DISPLAY> <WORKDIR>/run_remote_app.sh weston-smoke
+$ WAYLAND_DISPLAY=<your_WAYLAND_DISPLAY> <WORKDIR>/run_remote_app.sh weston-editor
+```
+
+**Appendix**  
+- By building the RVGPU on Ubuntu, it is possible to enable bidirectional remote rendering between the agl-demo-platform and Ubuntu.  
+For the build procedure on Ubuntu, see the following URL: https://github.com/unified-hmi/remote-virtio-gpu .
+
+## How to set up Distributed Display Framework (DDFW)
+
+To utilize DDFW, you need to set up each image with a distinct hostname and static IP address, and ensure that ivi-shell is running using the wayland-ivi-extension. Please note that the following configurations are examples and should be adapted to fit your specific network environment.
+
+In the following sections, introducing the steps to run DDFW on the `agl-image-weston` image.
+
+### Run weston with ivi-shell
+
+Before setting unique hostnames and configuring static IP addresses, it is essential to start Weston with ivi-shell since DDFW controls the layout of applications using ivi-shell. To initialize ivi-shell, follow these steps:
+
+First, please create the following content as /etc/xdg/weston/weston_ivi-shell.ini 
+```
+[core]
+shell=ivi-shell.so
+modules=ivi-controller.so
+require-input=false
+
+[output]
+name=HDMI-A-1
+mode=1920x1080@60
+
+[output]
+name=HDMI-A-2
+mode=1920x1080@60
+
+[output]
+name=HDMI-A-3
+mode=1920x1080@60
+
+[output]
+name=DSI-1
+mode=1920x1080@60
+
+[output]
+name=DSI-2
+mode=1920x1080@60
+
+[output]
+name=DP-1
+mode=1920x1080@60
+
+[output]
+name=Virtual-1
+mode=1920x1080
+
+[output]
+name=Virtual-2
+mode=1920x1080
+
+[output]
+name=VGA-1
+mode=1920x1080
+
+[output]
+name=VGA-2
+mode=1920x1080
+
+[ivi-shell]
+ivi-input-module=ivi-input-controller.so
+#ivi-client-name=/usr/bin/simple-weston-client
+bkgnd-surface-id=1000000
+bkgnd-color=0xFF000000
+```
+
+Next, to start Weston with the configuration created above, please execute the following command.
+```
+ln -sf /etc/xdg/weston/weston_ivi-shell.ini /etc/xdg/weston/weston.ini
+systemctl restart weston
+```
+
+**Note**: Even after the launch of the ivi-shell is complete, the screen remains black and nothing is displayed until the application is shown.
+
+### Configuration to run Unified HMI frameworks on launched weston.
+
+By setting XDG_RUNTIME_DIR=/run/user/<your_UID> and WAYLAND_DISPLAY=<your_WAYLAND_DISPLAY> in /lib/systemd/system/uhmi-ivi-wm.service, you can display the applications launched by Unified HMI on Weston.
+
+Please execute `$ls /run/user/` in your environment to check <your_UID>.
+Additionally, when Weston is launched, <your_WAYLAND_DISPLAY> will be generated under /run/user/<your_UID>, so please check that as well.
+
+e.g. In agl-image-weston, <your_UID> is set to 200 and <your_WAYLAND_DISPLAY> is set to wayland-1. Please create **/etc/default/uhmi-ivi-wm** as follows and set correct valiables:
+```
+XDG_RUNTIME_DIR=/run/user/200
+WAYLAND_DISPLAY=wayland-1
+```
+
+### Set Unique Hostnames
+
+Edit the `/etc/hostname` file on each image to set a unique hostname. Here are the suggested hostnames for the first two images:
+
+- **For the first image:**
+```
+echo "agl-host0" | tee /etc/hostname
+```
+- **For the second image:**
+```
+echo "agl-host1" | tee /etc/hostname
+```
+
+### Assign Static IP Addresses
+
+Configure a static IP address for each image by editing the `/etc/systemd/network/wired.network` file. If this file does not exist, please create a new one. Use the following template and replace `<IP_address>` and `<Netmask>` with your network's specific settings:
+
+```ini
+[Match]
+KernelCommandLine=!root=/dev/nfs
+Name=eth* en*
+
+[Network]
+Address=<IP_address>/<Netmask>
+```
+
+Here is how you might configure the static IP addresses for the first two images:
+
+- **For the first image:**
+```
+[Match]
+KernelCommandLine=!root=/dev/nfs
+Name=eth* en*
+
+[Network]
+Address=192.168.0.100/24
+```
+- **For the second image:**
+```
+[Match]
+KernelCommandLine=!root=/dev/nfs
+Name=eth* en*
+
+[Network]
+Address=192.168.0.101/24
+```
+
+Once the hostname and IP addresses settings are complete, please reboot to reflect these settings.
+
+### Customizing Virtual Screen Definitions
+
+Adjust the `/etc/uhmi-framework/virtual-screen-def.json` file to match your environment. In the folowing example, we assume an environment where two images, agl-host0 and agl-host1, each have a display output with a resolusion of 1920x1080(FullHD), arranged in order from left to right as agl-host0 and then agl-host1:
+
+```
+{
+    "virtual_screen_2d": {
+        "size": {"virtual_w": 3840, "virtual_h": 1080},
+        "virtual_displays": [
+            {"vdisplay_id": 0, "disp_name": "AGL_SCREEN0", "virtual_x": 0, "virtual_y": 0, "virtual_w": 1920, "virtual_h": 1080},
+            {"vdisplay_id": 1, "disp_name": "AGL_SCREEN1", "virtual_x": 1920, "virtual_y": 0, "virtual_w": 1920, "virtual_h": 1080}
+        ]
+    },
+    "virtual_screen_3d": {},
+    "real_displays": [
+        {"node_id": 0, "vdisplay_id": 0, "pixel_w": 1920, "pixel_h": 1080, "rdisplay_id": 0},
+        {"node_id": 1, "vdisplay_id": 1, "pixel_w": 1920, "pixel_h": 1080, "rdisplay_id": 0}
+    ],
+    "node": [
+        {"node_id": 0, "hostname": "agl-host0", "ip": "192.168.0.100"},
+        {"node_id": 1, "hostname": "agl-host1", "ip": "192.168.0.101"}
+    ],
+    "distributed_window_system": {
+        "window_manager": {},
+        "framework_node": [
+            {"node_id": 0, "ula": {"debug": false, "debug_port": 8080, "port": 10100}, "ucl": {"port": 7654}},
+            {"node_id": 1, "ula": {"debug": false, "debug_port": 8080, "port": 10100}, "ucl": {"port": 7654}}
+        ]
+    }
+}
+```
+
+Be sure to update the virtual_w, virtual_h, virtual_x, virtual_y, pixel_w, pixel_h, hostname, and ip fields to accurately reflect your specific network configuration.
+
+### Restarting Services
+Once you have prepared the virtual-screen-def.json file and configured the system, you need to restart the system or the following services for the changes to take effect:
+```
+systemctl restart uhmi-ivi-wm
+systemctl restart ula-node
+systemctl restart ucl-launcher
+```
+
+After restarting these services, your system should be ready to use the DDFW with the new configuration.
+
+## How to use UCL (Unified Clustering) Framework
+
+The Unified Clustering (UCL) Framework provides a distributed launch feature for applications using remote virtio GPU (rvgpu). By preparing a JSON configuration, you can enable the launch of applications across multiple devices in a distributed environment.
+
+### Setting Up for Application Launch using UCL
+
+To facilitate the distributed launch of an application with UCL, you need to create a JSON configuration file that specifies the details of the application and how it should be executed on the sender and receiver nodes. 
+
+Here's an example of such a JSON configuration named `app.json`:
+```
+{
+    "format_v1": {
+        "command_type" : "remote_virtio_gpu",
+        "appli_name" : "weston-simple-egl",
+        "sender" : {
+            "launcher" : "agl-host0",
+            "command" : "/usr/bin/ucl-virtio-gpu-wl-send",
+            "frontend_params" : {
+                "scanout_x" : 0,
+                "scanout_y" : 0,
+                "scanout_w" : 1920,
+                "scanout_h" : 1080,
+                "server_port" : 33445
+            },
+            "appli" : "/usr/bin/weston-simple-egl -s 1920x1080",
+            "env" : "LD_LIBRARY_PATH=/usr/lib/mesa-virtio"
+        },
+        "receivers" : [
+            {
+                "launcher" : "agl-host0",
+                "command" : "/usr/bin/ucl-virtio-gpu-wl-recv",
+                "backend_params" : {
+                    "ivi_surface_id" : 101000,
+                    "scanout_x" : 0,
+                    "scanout_y" : 0,
+                    "scanout_w" : 1920,
+                    "scanout_h" : 1080,
+                    "listen_port" : 33445,
+                    "initial_screen_color" : "0x33333333"
+                },
+                "env" : "XDG_RUNTIME_DIR=/run/user/200 WAYLAND_DISPLAY=wayland-1"
+            },
+            {
+                "launcher" : "agl-host1",
+                "command" : "/usr/bin/ucl-virtio-gpu-wl-recv",
+                "backend_params" : {
+                    "ivi_surface_id" : 101000,
+                    "scanout_x" : 0,
+                    "scanout_y" : 0,
+                    "scanout_w" : 1920,
+                    "scanout_h" : 1080,
+                    "listen_port" : 33445,
+                    "initial_screen_color" : "0x33333333"
+                },
+                "env" : "XDG_RUNTIME_DIR=/run/user/200 WAYLAND_DISPLAY=wayland-1"
+            }
+        ]
+    }
+}
+```
+
+In this example, the application weston-simple-egl is configured to launch on the sender node `agl-host0` and display its output on the receiver nodes `agl-host0` and `agl-host1`. The `scanout_x`, `scanout_y`, `scanout_w`, `scanout_h` parameters define the size of the window, while `server_port` and `listen_port` ensure the communication between sender and receivers.
+
+### Launching the Application
+
+Once the JSON configuration file is ready, you can execute the application across the distributed system by piping the JSON content to the `ucl-distrib-com` command along with the path to the `virtual-screen-def.json` file:
+
+```
+cat app.json | ucl-distrib-com /etc/uhmi-framework/virtual-screen-def.json
+```
+
+This command will read the configuration and initiate the application launch process, distributing the workload as defined in the JSON file.
+
+Please ensure that the JSON configuration file you create (`app.json` in the example) is correctly formatted and contains the appropriate parameters for your specific use case.
+
+**Note**: Please be aware that when using ivi-shell, applications will not be displayed unless layout configuration is specified as described later in this document. If you wish to display applications without specific layout configuration, you should run weston with desktop-shell. This distinction is crucial to ensure that your applications are visible in your chosen environment.
+
+## How to use ULA (Unified Layout) Framework
+
+The Unified Layout (ULA) Framework allows for the definition of physical displays on a virtual screen and provides the ability to apply layout settings such as position and size to applications launched using the UCL Framework.
+
+### Creating a Layout Configuration File
+
+To define the layout for your applications, you need to create a JSON file, such as `initial_vscreen.json`, with the necessary configuration details. This file will contain the layout settings that specify how applications should be positioned and sized within the virtual screen. Here is an example of what the contents of `initial_vscreen.json` file might look like:
+
+```
+{
+  "command": "initial_vscreen",
+  "vlayer": [
+    {
+      "VID": 1010000,
+      "coord": "global",
+      "virtual_w": 1920, "virtual_h": 1080,
+      "vsrc_x": 0, "vsrc_y": 0, "vsrc_w": 1920, "vsrc_h": 1080,
+      "vdst_x": 960, "vdst_y": 0, "vdst_w": 1920, "vdst_h": 1080,
+      "vsurface": [
+        {
+          "VID": 101000,
+          "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
+        }
+      ]
+    }
+  ]
+}
+```
+
+In this example, the application is renderd across the right half of the agl-host0 and the left half of agl-host1 display.
+
+In this configuration:
+
+- **vlayer** defines a virtual layer that represents a group of surfaces within the virtual screen. Each layer has a unique Virtual ID (VID) and can contain multiple surfaces. The layer's source (`vsrc_x`, `vsrc_y`, `vsrc_w`, `vsrc_h`) and destination (`vdst_x`, `vdst_y`, `vdst_w`, `vdst_h`) coordinates determine where and how large the layer appears on the virtual screen.
+
+- **vsurface**  defines individual surfaces within the virtual layer. Each surface also has a VID, and its pixel dimensions (`pixel_w`, `pixel_h`) represent the actual size of the content. The source (`psrc_x`, `psrc_y`, `psrc_w`, `psrc_h`) and destination (`vdst_x`, `vdst_y`, `vdst_w`, `vdst_h`) coordinates determine the portion of the content to display and its location within the layer.
+
+### Applying the Layout Configuration
+
+Once you have created the `initial_vscreen.json` file with your layout configuration, you can apply it to your system using the following command:
+
+```
+cat initial_vscreen.json | ula-distrib-com
+```
+
+Executing this command will process the configuration from the JSON file and apply the layout settings to the virtual screen. As a result, the applications will appear in the specified positions and sizes according to the layout defined in the file.
+
+Ensure that `initial_vscreen.json` file you create accurately reflects the desired layout for your applications and display setup.
+
+**Note**: Due to the specifications of ivi_shell, when an application is stopped after being displayed, the image that was shown just before stopping remains on the screen. To avoid this, please eigther restart weston or display another image on ivi_shell to update the displayed content.
diff --git a/meta-uhmi/meta-rvgpu/conf/layer.conf b/meta-uhmi/conf/layer.conf
index 5451560f..b136c453 100644
--- a/meta-uhmi/meta-rvgpu/conf/layer.conf
+++ b/meta-uhmi/conf/layer.conf
@@ -5,13 +5,13 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 	${LAYERDIR}/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS += "meta-rvgpu"
-BBFILE_PATTERN_meta-rvgpu = "^${LAYERDIR}/"
-BBFILE_PRIORITY_meta-rvgpu = "8"
+BBFILE_COLLECTIONS += "meta-uhmi"
+BBFILE_PATTERN_meta-uhmi = "^${LAYERDIR}/"
+BBFILE_PRIORITY_meta-uhmi = "8"
 
 BBFILES_DYNAMIC += " \
     rcar-gen3:${LAYERDIR}/dynamic-layers/rcar-gen3/*/*/*.bbappend \
     raspberrypi:${LAYERDIR}/dynamic-layers/raspberrypi/*/*/*.bbappend \
 "
 
-LAYERSERIES_COMPAT_meta-rvgpu= "scarthgap"
+LAYERSERIES_COMPAT_meta-uhmi= "scarthgap"
diff --git a/meta-uhmi/meta-rvgpu/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-common/enable-virtio.cfg b/meta-uhmi/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-common/enable-virtio.cfg
index 82ff9ea1..82ff9ea1 100644
--- a/meta-uhmi/meta-rvgpu/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-common/enable-virtio.cfg
+++ b/meta-uhmi/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-common/enable-virtio.cfg
diff --git a/meta-uhmi/meta-rvgpu/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend b/meta-uhmi/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend
index d093e40f..d093e40f 100644
--- a/meta-uhmi/meta-rvgpu/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend
+++ b/meta-uhmi/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend
diff --git a/meta-uhmi/meta-rvgpu/dynamic-layers/rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend b/meta-uhmi/dynamic-layers/rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend
index 1b238eea..1b238eea 100644
--- a/meta-uhmi/meta-rvgpu/dynamic-layers/rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend
+++ b/meta-uhmi/dynamic-layers/rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend
diff --git a/meta-uhmi/meta-distributed-display-fw/README.md b/meta-uhmi/meta-distributed-display-fw/README.md
deleted file mode 100644
index 907d6275..00000000
--- a/meta-uhmi/meta-distributed-display-fw/README.md
+++ /dev/null
@@ -1,236 +0,0 @@
-## How to set up Distributed Display Framework
-
-To utilize the Distributed Display Framework, you need to set up each image with a distinct hostname and static IP address, and ensure that ivi-shell is running using the wayland-ivi-extension. Please note that the following configurations are examples and should be adapted to fit your specific network environment.
-
-### Run weston with ivi-shell
-
-Before setting unique hostnames and configuring static IP addresses, it is essential to start Weston with ivi-shell since the Distributed Display Framework controls the layout of applications using ivi-shell. To initialize ivi-shell, follow these steps:
-
-```
-ln -sf /etc/xdg/weston/weston_ivi-shell.ini /etc/xdg/weston/weston.ini
-systemctl restart weston
-```
-
-Now that ivi-shell is properly initialized, you can proceed to set unique hostnames for your images.
-
-### Set Unique Hostnames
-
-Edit the `/etc/hostname` file on each image to set a unique hostname. Here are the suggested hostnames for the first two images:
-
-- **For the first image:**
-```
-echo "agl-host0" | tee /etc/hostname
-```
-- **For the second image:**
-```
-echo "agl-host1" | tee /etc/hostname
-```
-
-### Assign Static IP Addresses
-
-Configure a static IP address for each image by editing the `/etc/systemd/network/wired.network` file. If this file does not exist, please create a new one. Use the following template and replace `<IP_address>` and `<Netmask>` with your network's specific settings:
-
-```ini
-[Match]
-KernelCommandLine=!root=/dev/nfs
-Name=eth* en*
-
-[Network]
-Address=<IP_address>/<Netmask>
-```
-
-Here is how you might configure the static IP addresses for the first two images:
-
-- **For the first image:**
-```
-[Match]
-KernelCommandLine=!root=/dev/nfs
-Name=eth* en*
-
-[Network]
-Address=192.168.0.100/24
-```
-- **For the second image:**
-```
-[Match]
-KernelCommandLine=!root=/dev/nfs
-Name=eth* en*
-
-[Network]
-Address=192.168.0.101/24
-```
-
-Once the hostname and IP addresses settings are complete, please reboot to reflect these settings.
-
-### Customizing Virtual Screen Definitions
-
-Adjust the `/etc/uhmi-framework/virtual-screen-def.json` file to match your environment. In the folowing example, we assume an environment where two images, agl-host0 and agl-host1, each have a display output with a resolusion of 1920x1080(FullHD), arranged in order from left to right as agl-host0 and then agl-host1:
-
-```
-{
-    "virtual_screen_2d": {
-        "size": {"virtual_w": 3840, "virtual_h": 1080},
-        "virtual_displays": [
-            {"vdisplay_id": 0, "disp_name": "AGL_SCREEN0", "virtual_x": 0, "virtual_y": 0, "virtual_w": 1920, "virtual_h": 1080},
-            {"vdisplay_id": 1, "disp_name": "AGL_SCREEN1", "virtual_x": 1920, "virtual_y": 0, "virtual_w": 1920, "virtual_h": 1080}
-        ]
-    },
-    "virtual_screen_3d": {},
-    "real_displays": [
-        {"node_id": 0, "vdisplay_id": 0, "pixel_w": 1920, "pixel_h": 1080, "rdisplay_id": 0},
-        {"node_id": 1, "vdisplay_id": 1, "pixel_w": 1920, "pixel_h": 1080, "rdisplay_id": 1}
-    ],
-    "node": [
-        {"node_id": 0, "hostname": "agl-host0", "ip": "192.168.0.100"},
-        {"node_id": 1, "hostname": "agl-host1", "ip": "192.168.0.101"}
-    ],
-    "distributed_window_system": {
-        "window_manager": {},
-        "framework_node": [
-            {"node_id": 0, "ula": {"debug": false, "debug_port": 8080, "port": 10100}, "ucl": {"port": 7654}},
-            {"node_id": 1, "ula": {"debug": false, "debug_port": 8080, "port": 10100}, "ucl": {"port": 7654}}
-        ]
-    }
-}
-```
-
-Be sure to update the virtual_w, virtual_h, virtual_x, virtual_y, pixel_w, pixel_h, hostname, and ip fields to accurately reflect your specific network configuration.
-
-### Restarting Services
-Once you have prepared the virtual-screen-def.json file and configured the system, you need to restart the system or the following services for the changes to take effect:
-```
-systemctl restart uhmi-ivi-wm
-systemctl restart ula-node
-systemctl restart ucl-launcher
-```
-
-After restarting these services, your system should be ready to use the Distributed Display Framework with the new configuration.
-
-## How to use UCL (Unified Clustering) Framework
-
-The Unified Clustering (UCL) Framework provides a distributed launch feature for applications using remote virtio GPU (rvgpu). By preparing a JSON configuration, you can enable the launch of applications across multiple devices in a distributed environment.
-
-### Setting Up for Application Launch using UCL
-
-To facilitate the distributed launch of an application with UCL, you need to create a JSON configuration file that specifies the details of the application and how it should be executed on the sender and receiver nodes. Here's an example of such a JSON configuration named `app.json`:
-```
-{
-    "format_v1": {
-        "command_type" : "remote_virtio_gpu",
-        "appli_name" : "glmark2-es2-wayland",
-        "sender" : {
-            "launcher" : "agl-host0",
-            "command" : "/usr/bin/ucl-virtio-gpu-wl-send",
-            "frontend_params" : {
-                "scanout_x" : 0,
-                "scanout_y" : 0,
-                "scanout_w" : 1920,
-                "scanout_h" : 1080,
-                "server_port" : 33445
-            },
-            "appli" : "/usr/bin/glmark2-es2-wayland -s 1920x1080",
-            "env" : "LD_LIBRARY_PATH=/usr/lib/mesa-virtio"
-        },
-        "receivers" : [
-            {
-                "launcher" : "agl-host0",
-                "command" : "/usr/bin/ucl-virtio-gpu-wl-recv",
-                "backend_params" : {
-                    "ivi_surface_id" : 101000,
-                    "scanout_x" : 0,
-                    "scanout_y" : 0,
-                    "scanout_w" : 1920,
-                    "scanout_h" : 1080,
-                    "listen_port" : 33445,
-                    "initial_screen_color" : "0x33333333"
-                },
-                "env" : "XDG_RUNTIME_DIR=/run/user/200 WAYLAND_DISPLAY=wayland-1"
-            },
-            {
-                "launcher" : "agl-host1",
-                "command" : "/usr/bin/ucl-virtio-gpu-wl-recv",
-                "backend_params" : {
-                    "ivi_surface_id" : 101000,
-                    "scanout_x" : 0,
-                    "scanout_y" : 0,
-                    "scanout_w" : 1920,
-                    "scanout_h" : 1080,
-                    "listen_port" : 33445,
-                    "initial_screen_color" : "0x33333333"
-                },
-                "env" : "XDG_RUNTIME_DIR=/run/user/200 WAYLAND_DISPLAY=wayland-1"
-            }
-        ]
-    }
-}
-```
-
-In this example, the application glmark2-es2-wayland is configured to launch on the sender node `agl-host0` and display its output on the receiver nodes `agl-host0` and `agl-host1`. The `scanout_x`, `scanout_y`, `scanout_w`, `scanout_h` parameters define the size of the window, while `server_port` and `listen_port` ensure the communication between sender and receivers.
-
-### Launching the Application
-
-Once the JSON configuration file is ready, you can execute the application across the distributed system by piping the JSON content to the `ucl-distrib-com` command along with the path to the `virtual-screen-def.json` file:
-
-```
-cat app.json | ucl-distrib-com /etc/uhmi-framework/virtual-screen-def.json
-```
-
-This command will read the configuration and initiate the application launch process, distributing the workload as defined in the JSON file.
-
-
-Please ensure that the JSON configuration file you create (`app.json` in the example) is correctly formatted and contains the appropriate parameters for your specific use case.
-
-**Note**: Please be aware that when using ivi-shell, applications will not be displayed unless layout configuration is specified as described later in this document. If you wish to display applications without specific layout configuration, you should run weston with desktop-shell. This distinction is crucial to ensure that your applications are visible in your chosen environment.
-
-## How to use ULA (Unified Layout) Framework
-
-The Unified Layout (ULA) Framework allows for the definition of physical displays on a virtual screen and provides the ability to apply layout settings such as position and size to applications launched using the UCL Framework.
-
-### Creating a Layout Configuration File
-
-To define the layout for your applications, you need to create a JSON file, such as `initial_vscreen.json`, with the necessary configuration details. This file will contain the layout settings that specify how applications should be positioned and sized within the virtual screen. Here is an example of what the contents of `initial_vscreen.json` file might look like:
-
-```
-{
-  "command": "initial_vscreen",
-  "vlayer": [
-    {
-      "VID": 1010000,
-      "coord": "global",
-      "virtual_w": 1920, "virtual_h": 1080,
-      "vsrc_x": 0, "vsrc_y": 0, "vsrc_w": 1920, "vsrc_h": 1080,
-      "vdst_x": 960, "vdst_y": 0, "vdst_w": 1920, "vdst_h": 1080,
-      "vsurface": [
-        {
-          "VID": 101000,
-          "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
-        }
-      ]
-    }
-  ]
-}
-```
-
-In this example, the application is renderd across the right half of the agl-host0 and the left half of agl-host1 display.
-
-In this configuration:
-
-- **vlayer** defines a virtual layer that represents a group of surfaces within the virtual screen. Each layer has a unique Virtual ID (VID) and can contain multiple surfaces. The layer's source (`vsrc_x`, `vsrc_y`, `vsrc_w`, `vsrc_h`) and destination (`vdst_x`, `vdst_y`, `vdst_w`, `vdst_h`) coordinates determine where and how large the layer appears on the virtual screen.
-
-- **vsurface**  defines individual surfaces within the virtual layer. Each surface also has a VID, and its pixel dimensions (`pixel_w`, `pixel_h`) represent the actual size of the content. The source (`psrc_x`, `psrc_y`, `psrc_w`, `psrc_h`) and destination (`vdst_x`, `vdst_y`, `vdst_w`, `vdst_h`) coordinates determine the portion of the content to display and its location within the layer.
-
-### Applying the Layout Configuration
-
-Once you have created the `initial_vscreen.json` file with your layout configuration, you can apply it to your system using the following command:
-
-```
-cat initial_vscreen.json | ula-distrib-com
-```
-
-Executing this command will process the configuration from the JSON file and apply the layout settings to the virtual screen. As a result, the applications will appear in the specified positions and sizes according to the layout defined in the file.
-
-Ensure that `initial_vscreen.json` file you create accurately reflects the desired layout for your applications and display setup.
-
-**Note**: Due to the specifications of ivi_shell, when an application is stopped after being displayed, the image that was shown just before stopping remains on the screen. To avoid this, please eigther restart weston or display another image on ivi_shell to update the displayed content.
\ No newline at end of file
diff --git a/meta-uhmi/meta-distributed-display-fw/conf/layer.conf b/meta-uhmi/meta-distributed-display-fw/conf/layer.conf
deleted file mode 100644
index ba8984fa..00000000
--- a/meta-uhmi/meta-distributed-display-fw/conf/layer.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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 += "meta-distributed-display-fw"
-BBFILE_PATTERN_meta-distributed-display-fw = "^${LAYERDIR}/"
-BBFILE_PRIORITY_meta-distributed-display-fw = "8"
-
-LAYERSERIES_COMPAT_meta-distributed-display-fw= "scarthgap"
diff --git a/meta-uhmi/meta-rvgpu/README.md b/meta-uhmi/meta-rvgpu/README.md
deleted file mode 100644
index 3d524fef..00000000
--- a/meta-uhmi/meta-rvgpu/README.md
+++ /dev/null
@@ -1,54 +0,0 @@
-## How to run RVGPU remotely
-Prepare two images, one as the Sender and the other as the Receiver.
-It is necessary for the Sender and Receiver to be within the same network.
-
-**Receiver side**  
-```
-$ export XDG_RUNTIME_DIR=/run/user/<your_UID>
-$ rvgpu-renderer -b <your_Area>@0,0 -p <Port_Number> &
-```
-
-Replace the placeholders with the appropriate values:
-- `<your_UID>`: Specify according to your environment, for example: 200
-- `<your_Area>`: Enter an usable area for example: 1920x1080  
-- `<Port_Number>`: Enter an available port number, for example: 55555
-
-**Sender side**  
-Create the following shell script **run_remote_app.sh** in any `<WORKDIR>` for a smooth experience.
-```
-#!/bin/bash
-
-export XDG_RUNTIME_DIR=/tmp
-export LD_LIBRARY_PATH=/usr/lib/mesa-virtio
-
-# -------------
-# launch app
-# -------------
-$@
-```
-
-Save the file and run the following to start weston.
-
-```
-$ rvgpu-proxy -s <your_Area>@0,0 -n <IP_address_of_Receiver>:<Port_Number> &
-$ EGLWINSYS_DRM_DEV_NAME=<RVGPU_DRM_DEVICE_PATH> <WORKDIR>/run_remote_app.sh rvgpu-wlproxy -s <your_Area> -S <your_WAYLAND_DISPLAY> &
-```  
-Replace the placeholders with the appropriate values:
-- `<Port_Number>`: Port set in the renderer.
-- `<your_WAYLAND_DISPLAY>`: Specify your WAYLAND_DISPLAY socket name, for example: wayland-uhmi-0
-- `<RVGPU_DRM_DEVICE_PATH>`: Specify rvgpu drm device path generated by rvgpu-proxy, for example: /dev/dri/rvgpu_virtio0
-
-After completing these steps, the Weston screen from the Sender will be transferred and displayed on the Receiver using rvgpu-proxy and rvgpu-renderer. You can verify that everything is functioning properly by launching wayland applications on the Sender side, such as:
-```
-$ WAYLAND_DISPLAY=<your_WAYLAND_DISPLAY> <WORKDIR>/run_remote_app.sh weston-simple-egl -f
-``` 
-
-You can also verify the touch or keyboard operation support of the RVGPU by using app such as 
-```
-$ WAYLAND_DISPLAY=<your_WAYLAND_DISPLAY> <WORKDIR>/run_remote_app.sh weston-smoke
-$ WAYLAND_DISPLAY=<your_WAYLAND_DISPLAY> <WORKDIR>/run_remote_app.sh weston-editor
-```
-
-**Appendix**  
-- By building the RVGPU on Ubuntu, it is possible to enable bidirectional remote rendering between the agl-demo-platform and Ubuntu.  
-For the build procedure on Ubuntu, see the following URL: https://github.com/unified-hmi/remote-virtio-gpu
\ No newline at end of file
diff --git a/meta-uhmi/meta-distributed-display-fw/recipes-core/ucl-tools/files/ucl-launcher.service b/meta-uhmi/recipes-core/ucl-tools/files/ucl-launcher.service
index 37f289e6..37f289e6 100644
--- a/meta-uhmi/meta-distributed-display-fw/recipes-core/ucl-tools/files/ucl-launcher.service
+++ b/meta-uhmi/recipes-core/ucl-tools/files/ucl-launcher.service
diff --git a/meta-uhmi/meta-distributed-display-fw/recipes-core/ucl-tools/ucl-tools_git.bb b/meta-uhmi/recipes-core/ucl-tools/ucl-tools_git.bb
index cc26678b..cc26678b 100644
--- a/meta-uhmi/meta-distributed-display-fw/recipes-core/ucl-tools/ucl-tools_git.bb
+++ b/meta-uhmi/recipes-core/ucl-tools/ucl-tools_git.bb
diff --git a/meta-uhmi/meta-distributed-display-fw/recipes-core/uhmi-ivi-wm/files/uhmi-ivi-wm.service b/meta-uhmi/recipes-core/uhmi-ivi-wm/files/uhmi-ivi-wm.service
index aad36411..aad36411 100644
--- a/meta-uhmi/meta-distributed-display-fw/recipes-core/uhmi-ivi-wm/files/uhmi-ivi-wm.service
+++ b/meta-uhmi/recipes-core/uhmi-ivi-wm/files/uhmi-ivi-wm.service
diff --git a/meta-uhmi/meta-distributed-display-fw/recipes-core/uhmi-ivi-wm/uhmi-ivi-wm_git.bb b/meta-uhmi/recipes-core/uhmi-ivi-wm/uhmi-ivi-wm_git.bb
index daa5fff4..daa5fff4 100644
--- a/meta-uhmi/meta-distributed-display-fw/recipes-core/uhmi-ivi-wm/uhmi-ivi-wm_git.bb
+++ b/meta-uhmi/recipes-core/uhmi-ivi-wm/uhmi-ivi-wm_git.bb
diff --git a/meta-uhmi/meta-distributed-display-fw/recipes-core/ula-tools/files/ula-node.service b/meta-uhmi/recipes-core/ula-tools/files/ula-node.service
index edf69f3d..edf69f3d 100644
--- a/meta-uhmi/meta-distributed-display-fw/recipes-core/ula-tools/files/ula-node.service
+++ b/meta-uhmi/recipes-core/ula-tools/files/ula-node.service
diff --git a/meta-uhmi/meta-distributed-display-fw/recipes-core/ula-tools/files/virtual-screen-def.json b/meta-uhmi/recipes-core/ula-tools/files/virtual-screen-def.json
index 2917ca87..2917ca87 100644
--- a/meta-uhmi/meta-distributed-display-fw/recipes-core/ula-tools/files/virtual-screen-def.json
+++ b/meta-uhmi/recipes-core/ula-tools/files/virtual-screen-def.json
diff --git a/meta-uhmi/meta-distributed-display-fw/recipes-core/ula-tools/ula-tools_git.bb b/meta-uhmi/recipes-core/ula-tools/ula-tools_git.bb
index 9b945a3f..9b945a3f 100644
--- a/meta-uhmi/meta-distributed-display-fw/recipes-core/ula-tools/ula-tools_git.bb
+++ b/meta-uhmi/recipes-core/ula-tools/ula-tools_git.bb
diff --git a/meta-uhmi/meta-rvgpu/recipes-graphics/mesa-virtio/mesa-virtio_20.3.5.bb b/meta-uhmi/recipes-graphics/mesa-virtio/mesa-virtio_20.3.5.bb
index 9a0dab2f..9a0dab2f 100644
--- a/meta-uhmi/meta-rvgpu/recipes-graphics/mesa-virtio/mesa-virtio_20.3.5.bb
+++ b/meta-uhmi/recipes-graphics/mesa-virtio/mesa-virtio_20.3.5.bb
diff --git a/meta-uhmi/meta-rvgpu/recipes-graphics/remote-virtio-gpu/remote-virtio-gpu.inc b/meta-uhmi/recipes-graphics/remote-virtio-gpu/remote-virtio-gpu.inc
index ddd6dbab..ddd6dbab 100644
--- a/meta-uhmi/meta-rvgpu/recipes-graphics/remote-virtio-gpu/remote-virtio-gpu.inc
+++ b/meta-uhmi/recipes-graphics/remote-virtio-gpu/remote-virtio-gpu.inc
diff --git a/meta-uhmi/meta-rvgpu/recipes-graphics/remote-virtio-gpu/remote-virtio-gpu_git.bb b/meta-uhmi/recipes-graphics/remote-virtio-gpu/remote-virtio-gpu_git.bb
index 86e456c3..86e456c3 100644
--- a/meta-uhmi/meta-rvgpu/recipes-graphics/remote-virtio-gpu/remote-virtio-gpu_git.bb
+++ b/meta-uhmi/recipes-graphics/remote-virtio-gpu/remote-virtio-gpu_git.bb
diff --git a/meta-uhmi/meta-rvgpu/recipes-graphics/rvgpu-wlproxy/rvgpu-wlproxy_git.bb b/meta-uhmi/recipes-graphics/rvgpu-wlproxy/rvgpu-wlproxy_git.bb
index 5f6a70f2..5f6a70f2 100644
--- a/meta-uhmi/meta-rvgpu/recipes-graphics/rvgpu-wlproxy/rvgpu-wlproxy_git.bb
+++ b/meta-uhmi/recipes-graphics/rvgpu-wlproxy/rvgpu-wlproxy_git.bb
diff --git a/meta-uhmi/meta-distributed-display-fw/recipes-graphics/wayland/wayland-ivi-extension/0001-Update-libweston-to-version-13.patch b/meta-uhmi/recipes-graphics/wayland/wayland-ivi-extension/0001-Update-libweston-to-version-13.patch
index 008d0f4b..008d0f4b 100644
--- a/meta-uhmi/meta-distributed-display-fw/recipes-graphics/wayland/wayland-ivi-extension/0001-Update-libweston-to-version-13.patch
+++ b/meta-uhmi/recipes-graphics/wayland/wayland-ivi-extension/0001-Update-libweston-to-version-13.patch
diff --git a/meta-uhmi/meta-distributed-display-fw/recipes-graphics/wayland/wayland-ivi-extension_git.bb b/meta-uhmi/recipes-graphics/wayland/wayland-ivi-extension_git.bb
index f7b25917..f7b25917 100644
--- a/meta-uhmi/meta-distributed-display-fw/recipes-graphics/wayland/wayland-ivi-extension_git.bb
+++ b/meta-uhmi/recipes-graphics/wayland/wayland-ivi-extension_git.bb
diff --git a/meta-uhmi/meta-rvgpu/recipes-kernel/linux/linux-common/uinput.cfg b/meta-uhmi/recipes-kernel/linux/linux-common/uinput.cfg
index fd1f78ea..fd1f78ea 100644
--- a/meta-uhmi/meta-rvgpu/recipes-kernel/linux/linux-common/uinput.cfg
+++ b/meta-uhmi/recipes-kernel/linux/linux-common/uinput.cfg
diff --git a/meta-uhmi/meta-rvgpu/recipes-kernel/linux/linux-common/virtio-gpu.cfg b/meta-uhmi/recipes-kernel/linux/linux-common/virtio-gpu.cfg
index 5db61502..5db61502 100644
--- a/meta-uhmi/meta-rvgpu/recipes-kernel/linux/linux-common/virtio-gpu.cfg
+++ b/meta-uhmi/recipes-kernel/linux/linux-common/virtio-gpu.cfg
diff --git a/meta-uhmi/meta-rvgpu/recipes-kernel/linux/linux-rvgpu.inc b/meta-uhmi/recipes-kernel/linux/linux-rvgpu.inc
index 5d405afd..5d405afd 100644
--- a/meta-uhmi/meta-rvgpu/recipes-kernel/linux/linux-rvgpu.inc
+++ b/meta-uhmi/recipes-kernel/linux/linux-rvgpu.inc
diff --git a/meta-uhmi/meta-rvgpu/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-uhmi/recipes-kernel/linux/linux-yocto_%.bbappend
index 9dd82e3c..9dd82e3c 100644
--- a/meta-uhmi/meta-rvgpu/recipes-kernel/linux/linux-yocto_%.bbappend
+++ b/meta-uhmi/recipes-kernel/linux/linux-yocto_%.bbappend
diff --git a/meta-uhmi/meta-rvgpu/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver.inc b/meta-uhmi/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver.inc
index a7c0111b..a7c0111b 100644
--- a/meta-uhmi/meta-rvgpu/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver.inc
+++ b/meta-uhmi/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver.inc
diff --git a/meta-uhmi/meta-rvgpu/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver_git.bb b/meta-uhmi/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver_git.bb
index b9682aee..b9682aee 100644
--- a/meta-uhmi/meta-rvgpu/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver_git.bb
+++ b/meta-uhmi/recipes-kernel/virtio-loopback-driver/virtio-loopback-driver_git.bb
diff --git a/meta-uhmi/meta-distributed-display-fw/recipes-platform/packagegroups/packagegroup-distributed-display-fw.bb b/meta-uhmi/recipes-platform/packagegroups/packagegroup-ddfw.bb
index 291a5bf2..291a5bf2 100644
--- a/meta-uhmi/meta-distributed-display-fw/recipes-platform/packagegroups/packagegroup-distributed-display-fw.bb
+++ b/meta-uhmi/recipes-platform/packagegroups/packagegroup-ddfw.bb
diff --git a/meta-uhmi/meta-rvgpu/recipes-platform/packagegroups/packagegroup-rvgpu.bb b/meta-uhmi/recipes-platform/packagegroups/packagegroup-rvgpu.bb
index d7f55043..d7f55043 100644
--- a/meta-uhmi/meta-rvgpu/recipes-platform/packagegroups/packagegroup-rvgpu.bb
+++ b/meta-uhmi/recipes-platform/packagegroups/packagegroup-rvgpu.bb
diff --git a/templates/feature/agl-uhmi/50_bblayers.conf.inc b/templates/feature/agl-uhmi/50_bblayers.conf.inc
index b138ba39..94d07b1e 100644
--- a/templates/feature/agl-uhmi/50_bblayers.conf.inc
+++ b/templates/feature/agl-uhmi/50_bblayers.conf.inc
@@ -1,4 +1,3 @@
 BBLAYERS =+ " \
-  ${METADIR}/meta-agl-devel/meta-uhmi/meta-rvgpu \
-  ${METADIR}/meta-agl-devel/meta-uhmi/meta-distributed-display-fw \
+  ${METADIR}/meta-agl-devel/meta-uhmi \
 "