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>

7 files changed, 0 insertions, 232 deletions

diff --git a/meta-uhmi/meta-distributed-display-fw/recipes-core/ucl-tools/files/ucl-launcher.service b/meta-uhmi/meta-distributed-display-fw/recipes-core/ucl-tools/files/ucl-launcher.service
deleted file mode 100644
index 37f289e6..00000000
--- a/meta-uhmi/meta-distributed-display-fw/recipes-core/ucl-tools/files/ucl-launcher.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=ucl-launcher
-
-[Service]
-Type=idle
-ExecStart=/usr/bin/ucl-launcher
-KillSignal=SIGTERM
-TimeoutStopSec=10
-Restart=always
-RestartSec=2
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-uhmi/meta-distributed-display-fw/recipes-core/ucl-tools/ucl-tools_git.bb b/meta-uhmi/meta-distributed-display-fw/recipes-core/ucl-tools/ucl-tools_git.bb
deleted file mode 100644
index cc26678b..00000000
--- a/meta-uhmi/meta-distributed-display-fw/recipes-core/ucl-tools/ucl-tools_git.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-SUMMARY = "Unified HMI Clustering Tools"
-SECTION = "graphics"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://src/ucl-tools/LICENSE.md;md5=e789951aab02a3028d2e58b90fc933ba"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-
-PN="ucl-tools"
-PROVIDES += "ucl-tools"
-
-SRCREV = "80e83132834b5ab62875bc294332bd00cd559d5d"
-BRANCH ?= "main"
-SRC_URI = " \
-    git://github.com/unified-hmi/ucl-tools.git;protocol=https;branch=${BRANCH} \
-"
-PV = "0.0+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-export GO111MODULE="auto"
-
-GO_IMPORT = "ucl-tools"
-GO_INSTALL = " ${GO_IMPORT}/cmd/ucl-launcher ${GO_IMPORT}/cmd/ucl-distrib-com ${GO_IMPORT}/cmd/ucl-consistency-keeper ${GO_IMPORT}/cmd/ucl-ncount-master ${GO_IMPORT}/cmd/ucl-ncount-worker ${GO_IMPORT}/cmd/ucl-nkeep-master ${GO_IMPORT}/cmd/ucl-nkeep-worker ${GO_IMPORT}/cmd/ucl-timing-wrapper ${GO_IMPORT}/cmd/ucl-virtio-gpu-wl-send ${GO_IMPORT}/cmd/ucl-virtio-gpu-wl-recv"
-
-inherit go
-
-RDEPENDS:${PN}  = "bash"
-RDEPENDS:${PN}-dev = "bash"
-
-inherit systemd
-SRC_URI += " file://ucl-launcher.service"
-
-REQUIRED_DISTRO_FEATURES = "systemd"
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE:${PN} = "ucl-launcher.service"
-SYSTEMD_AUTO_ENABLE:${PN} = "enable"
-FILES:${PN} += " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_system_unitdir}/${SYSTEMD_SERVICE}', '', d)} \
-    "
-do_install:append() {
-    if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
-        install -d ${D}${systemd_system_unitdir}
-        install -m 644 ${WORKDIR}/*.service ${D}/${systemd_system_unitdir}
-    fi
-}
diff --git a/meta-uhmi/meta-distributed-display-fw/recipes-core/uhmi-ivi-wm/files/uhmi-ivi-wm.service b/meta-uhmi/meta-distributed-display-fw/recipes-core/uhmi-ivi-wm/files/uhmi-ivi-wm.service
deleted file mode 100644
index aad36411..00000000
--- a/meta-uhmi/meta-distributed-display-fw/recipes-core/uhmi-ivi-wm/files/uhmi-ivi-wm.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=uhmi ivi window manager
-After=weston.service
-
-[Service]
-Environment="XDG_RUNTIME_DIR=/run/user/1001"
-Environment="WAYLAND_DISPLAY=wayland-0"
-EnvironmentFile=-/etc/default/uhmi-ivi-wm
-
-Type=simple
-ExecStart=/usr/bin/uhmi-ivi-wm
-KillSignal=SIGKILL
-Restart=always
-RestartSec=1s
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-uhmi/meta-distributed-display-fw/recipes-core/uhmi-ivi-wm/uhmi-ivi-wm_git.bb b/meta-uhmi/meta-distributed-display-fw/recipes-core/uhmi-ivi-wm/uhmi-ivi-wm_git.bb
deleted file mode 100644
index daa5fff4..00000000
--- a/meta-uhmi/meta-distributed-display-fw/recipes-core/uhmi-ivi-wm/uhmi-ivi-wm_git.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-DESCRIPTION = "Panasonic UHMI ivi-window-manager"
-DEPENDS = " weston wayland-ivi-extension jansson"
-
-RDEPENDS:${PN} = " jansson"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=e789951aab02a3028d2e58b90fc933ba"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-
-PN="uhmi-ivi-wm"
-
-SRCREV = "ae86a2803f7a56bbc24d13756a2de78d58da854e"
-BRANCH ?= "main"
-SRC_URI = " \
-    git://github.com/unified-hmi/uhmi-ivi-wm.git;protocol=https;branch=${BRANCH} \
-"
-PV = "0.0+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-inherit cmake
-
-
-inherit systemd
-SRC_URI += " file://uhmi-ivi-wm.service"
-REQUIRED_DISTRO_FEATURES = "systemd"
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE:${PN} = "uhmi-ivi-wm.service"
-SYSTEMD_AUTO_ENABLE:${PN} = "enable"
-FILES:${PN} += " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_system_unitdir}/${SYSTEMD_SERVICE}', '', d)} \
-    "
-
-do_install:append() {
-    if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
-	install -d ${D}${systemd_system_unitdir}
-	install -m 644 ${WORKDIR}/*.service ${D}/${systemd_system_unitdir}
-    fi
-}
-
-
-FILES:${PN} += " /usr/bin/uhmi-ivi-wm"
-FILES:${PN} += " /usr/share/*"
diff --git a/meta-uhmi/meta-distributed-display-fw/recipes-core/ula-tools/files/ula-node.service b/meta-uhmi/meta-distributed-display-fw/recipes-core/ula-tools/files/ula-node.service
deleted file mode 100644
index edf69f3d..00000000
--- a/meta-uhmi/meta-distributed-display-fw/recipes-core/ula-tools/files/ula-node.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=ula-node
-Requires=uhmi-ivi-wm.service
-After=uhmi-ivi-wm.service
-
-[Service]
-Type=idle
-ExecStart=/usr/bin/ula-node
-KillSignal=SIGTERM
-TimeoutStopSec=10
-Restart=always
-RestartSec=2
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-uhmi/meta-distributed-display-fw/recipes-core/ula-tools/files/virtual-screen-def.json b/meta-uhmi/meta-distributed-display-fw/recipes-core/ula-tools/files/virtual-screen-def.json
deleted file mode 100644
index 2917ca87..00000000
--- a/meta-uhmi/meta-distributed-display-fw/recipes-core/ula-tools/files/virtual-screen-def.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "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}}
-	]
-    }
-}
diff --git a/meta-uhmi/meta-distributed-display-fw/recipes-core/ula-tools/ula-tools_git.bb b/meta-uhmi/meta-distributed-display-fw/recipes-core/ula-tools/ula-tools_git.bb
deleted file mode 100644
index 9b945a3f..00000000
--- a/meta-uhmi/meta-distributed-display-fw/recipes-core/ula-tools/ula-tools_git.bb
+++ /dev/null
@@ -1,72 +0,0 @@
-SUMMARY = "Unified HMI Layout Tools"
-SECTION = "graphics"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://src/ula-tools/LICENSE.md;md5=e789951aab02a3028d2e58b90fc933ba"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-
-PN="ula-tools"
-PROVIDES += "ula-tools"
-
-SRCREV = "4403efd88fd4e79b092787ac727afe996dd7ca12"
-BRANCH ?= "main"
-SRC_URI = " \
-    git://github.com/unified-hmi/ula-tools.git;protocol=https;branch=${BRANCH} \
-"
-PV = "0.0+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-
-export GO111MODULE="auto"
-
-GO_IMPORT = "ula-tools"
-GO_INSTALL = " ${GO_IMPORT}/cmd/ula-distrib-com  ${GO_IMPORT}/cmd/ula-node"
-
-
-inherit go
-RDEPENDS:${PN}  = "jq bash"
-RDEPENDS:${PN}-dev  = "bash"
-
-inherit systemd
-
-SRC_URI += " \
-	file://ula-node.service \
-	file://virtual-screen-def.json \
-	"
-
-REQUIRED_DISTRO_FEATURES = "systemd"
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE:${PN} = "ula-node.service"
-SYSTEMD_AUTO_ENABLE:${PN} = "enable"
-FILES:${PN} += " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_system_unitdir}/${SYSTEMD_SERVICE}', '', d)} \
-    /etc/uhmi-framework/virtual-screen-def.json \
-    "
-
-do_compile:append() {
-    export CGO_ENABLED="1"
-    ${GO} build  -buildmode=c-shared -o ${GOPATH}/pkg/libulaclient.so -v -ldflags '-extldflags "-Wl,-soname=libulaclient.so"' ${GO_IMPORT}/pkg/ula-client-lib
-}
-
-
-do_install:append() {
-    if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
-        install -d ${D}${systemd_system_unitdir}
-        install -m 644 ${WORKDIR}/*.service ${D}/${systemd_system_unitdir}
-    fi
-
-    install -d ${D}/etc/uhmi-framework
-    install -m 644 ${WORKDIR}/virtual-screen-def.json ${D}/etc/uhmi-framework
-
-    install -d ${D}${libdir}
-    install -m 0755 ${GOPATH}/pkg/libulaclient.so ${D}${libdir}
-
-    install -d ${D}${includedir}
-    install -m 644 ${GOPATH}/pkg/libulaclient.h ${D}${includedir}
-
-}
-
-FILES:${PN} += "${libdir}"
-FILES:${PN} += "${includedir}"