From 837de3ab5be5bc6bb5ad5e26191e33920712e32d Mon Sep 17 00:00:00 2001
From: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
Date: Sat, 2 Oct 2021 12:52:56 +0900
Subject: Fix some issue for the cluster-refgui recipe

Cluster refgui upstreamd at SPEC-3942. But recipe was not changed.
Current refgui recipe has some issue.
 * Referring to github repository now.
 * Not changed recipe name from refgui to cluster-refgui.
 * License description is old, that is already changed from MIT to Apach-2.0.
This patch fix these issue.

Bug-AGL: SPEC-4090

Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
Change-Id: I2742caf36ed50a2dbf41274d172a11be33708841
---
 .../cluster-refgui/cluster-refgui/cluster.service  | 11 ++++++
 .../cluster-refgui/cluster-refgui_git.bb           | 45 ++++++++++++++++++++++
 .../recipes-demo/refgui/refgui/cluster.service     | 11 ------
 meta-agl-lxc/recipes-demo/refgui/refgui_git.bb     | 45 ----------------------
 .../images/guest-image-cluster-demo.bb             |  2 +-
 5 files changed, 57 insertions(+), 57 deletions(-)
 create mode 100644 meta-agl-lxc/recipes-demo/cluster-refgui/cluster-refgui/cluster.service
 create mode 100644 meta-agl-lxc/recipes-demo/cluster-refgui/cluster-refgui_git.bb
 delete mode 100644 meta-agl-lxc/recipes-demo/refgui/refgui/cluster.service
 delete mode 100644 meta-agl-lxc/recipes-demo/refgui/refgui_git.bb

(limited to 'meta-agl-lxc')

diff --git a/meta-agl-lxc/recipes-demo/cluster-refgui/cluster-refgui/cluster.service b/meta-agl-lxc/recipes-demo/cluster-refgui/cluster-refgui/cluster.service
new file mode 100644
index 00000000..d0c1ba4e
--- /dev/null
+++ b/meta-agl-lxc/recipes-demo/cluster-refgui/cluster-refgui/cluster.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=AGL Cluster Reference GUI
+After=weston@root.service
+Requires=weston@root.service
+
+[Service]
+Environment=XDG_RUNTIME_DIR=/run/user/0
+ExecStart=/opt/apps/cluster
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-agl-lxc/recipes-demo/cluster-refgui/cluster-refgui_git.bb b/meta-agl-lxc/recipes-demo/cluster-refgui/cluster-refgui_git.bb
new file mode 100644
index 00000000..7a5b8a78
--- /dev/null
+++ b/meta-agl-lxc/recipes-demo/cluster-refgui/cluster-refgui_git.bb
@@ -0,0 +1,45 @@
+DESCRIPTION = "AGL Cluster Reference GUI"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=5335066555b14d832335aa4660d6c376"
+
+DEPENDS = " \
+    qttools-native \
+    qtmultimedia \
+"
+
+BRANCH = "master"
+SRC_URI = "git://git.automotivelinux.org/src/cluster-refgui;protocol=https;branch=${BRANCH} \
+           file://cluster.service \
+"
+SRCREV = "a16c6201be94a57eb8151a91699084d99694877c"
+
+S = "${WORKDIR}/git"
+
+inherit cmake cmake_qt5 systemd
+
+# NOTE:
+# The app currently assumes the mp4 video file is in the same
+# directory, so changing this to ${bindir} to better match FHS
+# requires code changes.
+APP_DIR = "/opt/apps"
+EXTRA_OECMAKE = "-DAPPS_INST_DIR=${APP_DIR}"
+
+SYSTEMD_SERVICE:${PN} = "cluster.service"
+
+do_install:append() {
+    install -d ${D}${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/cluster.service ${D}${systemd_unitdir}/system/
+}
+
+FILES:${PN} += "${APP_DIR}/"
+
+RDEPENDS:${PN} = " \
+    qtbase \
+    qtdeclarative \
+    qt3d \
+    qtgraphicaleffects \
+    qtmultimedia \
+    qtquickcontrols \
+    qtquickcontrols2 \
+    qtwayland \
+"
diff --git a/meta-agl-lxc/recipes-demo/refgui/refgui/cluster.service b/meta-agl-lxc/recipes-demo/refgui/refgui/cluster.service
deleted file mode 100644
index d0c1ba4e..00000000
--- a/meta-agl-lxc/recipes-demo/refgui/refgui/cluster.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=AGL Cluster Reference GUI
-After=weston@root.service
-Requires=weston@root.service
-
-[Service]
-Environment=XDG_RUNTIME_DIR=/run/user/0
-ExecStart=/opt/apps/cluster
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-agl-lxc/recipes-demo/refgui/refgui_git.bb b/meta-agl-lxc/recipes-demo/refgui/refgui_git.bb
deleted file mode 100644
index 9d758dce..00000000
--- a/meta-agl-lxc/recipes-demo/refgui/refgui_git.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-DESCRIPTION = "AGL Cluster Reference GUI"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d2e73358b6893b535d5dfc7e89dc9d67"
-
-DEPENDS = " \
-    qttools-native \
-    qtmultimedia \
-"
-
-BRANCH = "main"
-SRC_URI = "git://github.com/agl-ic-eg/refgui;protocol=https;branch=${BRANCH} \
-           file://cluster.service \
-"
-SRCREV = "e52dd81073154838e7f417e33debc8f6794fc683"
-
-S = "${WORKDIR}/git"
-
-inherit cmake cmake_qt5 systemd
-
-# NOTE:
-# The app currently assumes the mp4 video file is in the same
-# directory, so changing this to ${bindir} to better match FHS
-# requires code changes.
-APP_DIR = "/opt/apps"
-EXTRA_OECMAKE = "-DAPPS_INST_DIR=${APP_DIR}"
-
-SYSTEMD_SERVICE:${PN} = "cluster.service"
-
-do_install:append() {
-    install -d ${D}${systemd_unitdir}/system
-    install -m 0644 ${WORKDIR}/cluster.service ${D}${systemd_unitdir}/system/
-}
-
-FILES:${PN} += "${APP_DIR}/"
-
-RDEPENDS:${PN} = " \
-    qtbase \
-    qtdeclarative \
-    qt3d \
-    qtgraphicaleffects \
-    qtmultimedia \
-    qtquickcontrols \
-    qtquickcontrols2 \
-    qtwayland \
-"
diff --git a/meta-agl-lxc/recipes-platform/images/guest-image-cluster-demo.bb b/meta-agl-lxc/recipes-platform/images/guest-image-cluster-demo.bb
index c07b8f7d..36f1ec7b 100644
--- a/meta-agl-lxc/recipes-platform/images/guest-image-cluster-demo.bb
+++ b/meta-agl-lxc/recipes-platform/images/guest-image-cluster-demo.bb
@@ -7,5 +7,5 @@ IMAGE_INSTALL += " \
     weston \
     weston-init \
     weston-ini-conf-landscape \
-    refgui \
+    cluster-refgui \
 "
-- 
cgit 1.2.3-korg