From 615ac6f0c1fc0de3e0b1ef072339c8d4d9933eb7 Mon Sep 17 00:00:00 2001
From: Clemens Terasa <clemens.terasa@garz-fricke.com>
Date: Wed, 3 Aug 2022 13:41:51 +0200
Subject: [PATCH] seco-show-demo: Port to the latest seco-show-demo
Use the latest seco-show-demo:
* Rename the guf-show-demo to seco-show-demo
* Pull from ew2022 branch
* Also some slides needed refinement.
---
recipes-bsp/images/seconorth-image.bb | 2 +-
.../packagegroup-seconorth-tests.bb | 2 +-
.../files/guf-show-demo.service | 0
.../files/seco-show-demo.service | 33 ++++++
.../guf-show-demo.bb | 0
.../init.d/guf-show-demo | 0
.../seco-show-demo/init.d/seco-show-demo | 30 +++++
.../seco-show-demo/seco-show-demo.bb | 104 ++++++++++++++++++
8 files changed, 169 insertions(+), 2 deletions(-)
rename recipes-seconorth/{guf-show-demo => seco-show-demo}/files/guf-show-demo.service (100%)
create mode 100644 recipes-seconorth/seco-show-demo/files/seco-show-demo.service
rename recipes-seconorth/{guf-show-demo => seco-show-demo}/guf-show-demo.bb (100%)
rename recipes-seconorth/{guf-show-demo => seco-show-demo}/init.d/guf-show-demo (100%)
create mode 100644 recipes-seconorth/seco-show-demo/init.d/seco-show-demo
create mode 100644 recipes-seconorth/seco-show-demo/seco-show-demo.bb
diff --git a/recipes-bsp/images/seconorth-image.bb b/recipes-bsp/images/seconorth-image.bb
index df059ad8..aa72a667 100644
--- a/recipes-bsp/images/seconorth-image.bb
+++ b/recipes-bsp/images/seconorth-image.bb
@@ -29,7 +29,7 @@ IMAGE_INSTALL_GRAPHICS += " \
"
IMAGE_INSTALL_SECONORTH += " \
- guf-show-demo \
+ seco-show-demo \
packagegroup-seconorth-debug \
packagegroup-seconorth-small \
"
diff --git a/recipes-bsp/packagegroups/packagegroup-seconorth-tests.bb b/recipes-bsp/packagegroups/packagegroup-seconorth-tests.bb
index ce339b38..8ca04f59 100644
--- a/recipes-bsp/packagegroups/packagegroup-seconorth-tests.bb
+++ b/recipes-bsp/packagegroups/packagegroup-seconorth-tests.bb
@@ -27,7 +27,7 @@ RDEPENDS:${PN}-small = " \
"
RDEPENDS:${PN} = " \
- ${PN} \
+ ${PN}-small \
emc-test-suite \
packagegroup-seconorth-multimedia-tests \
"
diff --git a/recipes-seconorth/guf-show-demo/files/guf-show-demo.service b/recipes-seconorth/seco-show-demo/files/guf-show-demo.service
similarity index 100%
rename from recipes-seconorth/guf-show-demo/files/guf-show-demo.service
rename to recipes-seconorth/seco-show-demo/files/guf-show-demo.service
diff --git a/recipes-seconorth/seco-show-demo/files/seco-show-demo.service b/recipes-seconorth/seco-show-demo/files/seco-show-demo.service
new file mode 100644
index 00000000..22233c27
--- /dev/null
+++ b/recipes-seconorth/seco-show-demo/files/seco-show-demo.service
@@ -0,0 +1,33 @@
+[Unit]
+Description=SECO Trade Show Demo
+
+After=weston.service
+Requires=weston.service
+Conflicts=getty@tty1.service
+
+
+[Service]
+Type=simple
+
+Environment=XDG_RUNTIME_DIR=/var/run/user/1000
+Environment=QT_QPA_FONTDIR=/usr/share/fonts/truetype
+Environment=QT_QPA_PLATFORM=wayland
+
+ExecStart=/usr/bin/seco-show-demo
+
+TimeoutSec=60
+Restart=on-failure
+
+StandardOutput=syslog
+StandardError=syslog
+SyslogIdentifier=seco-show-demo
+
+# The user to run Weston as.
+User=weston
+Group=weston
+
+# Make sure the working directory is the users home directory
+WorkingDirectory=/home/weston
+
+[Install]
+WantedBy=multi-user.target
diff --git a/recipes-seconorth/guf-show-demo/guf-show-demo.bb b/recipes-seconorth/seco-show-demo/guf-show-demo.bb
similarity index 100%
rename from recipes-seconorth/guf-show-demo/guf-show-demo.bb
rename to recipes-seconorth/seco-show-demo/guf-show-demo.bb
diff --git a/recipes-seconorth/guf-show-demo/init.d/guf-show-demo b/recipes-seconorth/seco-show-demo/init.d/guf-show-demo
similarity index 100%
rename from recipes-seconorth/guf-show-demo/init.d/guf-show-demo
rename to recipes-seconorth/seco-show-demo/init.d/guf-show-demo
diff --git a/recipes-seconorth/seco-show-demo/init.d/seco-show-demo b/recipes-seconorth/seco-show-demo/init.d/seco-show-demo
new file mode 100644
index 00000000..e5040928
--- /dev/null
+++ b/recipes-seconorth/seco-show-demo/init.d/seco-show-demo
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+OLDPATH=$PATH
+[ -f /etc/profile ] && . /etc/profile
+PATH=$OLDPATH:$PATH
+
+export DISPLAY=:0
+
+case "$1" in
+start)
+ # We don't want this script to block the rest of the boot process
+ if [ "$2" != "background" ]; then
+ $0 $1 background &
+ else
+ while [ -f /var/run/starting_xserver ]
+ do
+ sleep 1;
+ done
+
+ start-stop-daemon -m -p /var/run/seco-show-demo.pid -b -a /usr/bin/seco-show-demo -S
+ fi
+ ;;
+stop)
+ start-stop-daemon -p /var/run/seco-show-demo.pid -K
+ ;;
+*)
+ echo "Usage: /etc/init.d/seco-show-demo {start|stop}" >&2
+ exit 1
+ ;;
+esac
diff --git a/recipes-seconorth/seco-show-demo/seco-show-demo.bb b/recipes-seconorth/seco-show-demo/seco-show-demo.bb
new file mode 100644
index 00000000..860f723d
--- /dev/null
+++ b/recipes-seconorth/seco-show-demo/seco-show-demo.bb
@@ -0,0 +1,104 @@
+SUMMARY = "SECO Northern Europe Demo Application 219 Design"
+HOMEPAGE = "https://git.seco.com/seco-ne/tools/seco-show-demo"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
+
+DEPENDS = "qtbase qtquickcontrols"
+
+SRCREV = "${AUTOREV}"
+SRC_URI = "git://git.seco.com/seco-ne/tools/guf-show-demo.git;protocol=https;branch=kirkstone;nobranch=1 \
+ file://init.d/seco-show-demo \
+ file://seco-show-demo.service \
+ "
+
+# Create a <tag>-<number of commits since tag>-<hash> Version string
+inherit gitpkgv
+PKGV = "${GITPKGVTAG}"
+
+S = "${WORKDIR}/git"
+
+inherit autotools
+#inherit update-rc.d
+inherit systemd
+
+require recipes-qt/qt5/qt5.inc
+
+FILESEXTRAPATHS:prepend := "${THISDIR}:"
+
+# ${PN}-tools added by qt5.inc, but we do not need it
+PACKAGES:remove = "${PN}-tools"
+
+#PACKAGES =+ "${PN}-autostart"
+#RDEPENDS:${PN}-autostart += "seco-show-demo"
+#INITSCRIPT_PACKAGES = "${PN}-autostart"
+#INITSCRIPT_NAME:${PN}-autostart = "seco-show-demo"
+#INITSCRIPT_PARAMS:${PN}-autostart = "defaults 95 5"
+
+QMAKE_PROFILES = "${S}/${PN}.pro"
+
+IMAGE_DIR = "${datadir}/${PN}/images"
+SLIDE_DIR = "${datadir}/${PN}/assets/slides"
+VIDEO_DIR = "${datadir}/${PN}/assets"
+
+VIDEOFILE = "gf-corporate-video-en.mp4"
+
+do_configure:append:mx6ull-generic-bsp() {
+
+ sed -i ${WORKDIR}/seco-show-demo.service -e "/Environment.*wayland/a Environment=QT_QUICK_BACKEND=software"
+}
+
+do_install () {
+ #Application
+ install -d ${D}${bindir}
+ install -m 0755 ${PN} ${D}${bindir}
+
+ if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
+ #Init script
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/init.d/seco-show-demo ${D}${sysconfdir}/init.d/seco-show-demo
+ elif ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ #Systemd unit
+ install -d ${D}${systemd_system_unitdir}/
+ install -D -p -m0644 ${WORKDIR}/seco-show-demo.service ${D}${systemd_system_unitdir}/seco-show-demo.service
+ fi
+
+ #images
+ cd ${S}/images
+ for dir in `find -type d`; do
+ install -d ${D}${IMAGE_DIR}/$dir
+ done
+ for file in `find -type f`; do
+ install -m 0664 $file ${D}${IMAGE_DIR}/$file
+ done
+
+
+# #slides
+# cd ${S}/assets/slides
+# for dir in `find -type d`; do
+# install -d ${D}${SLIDE_DIR}/$dir
+# done
+# for file in `find -type f`; do
+# install -m 0664 $file ${D}${SLIDE_DIR}/$file
+# done
+#
+# #video
+# cd ${S}/assets
+# install -d ${D}${VIDEO_DIR}
+# install -m 0664 ${VIDEOFILE} ${D}${VIDEO_DIR}/${VIDEOFILE}
+
+
+# install -d ${D}/opt/${PN}
+# ln -s ${VIDEO_DIR} ${D}/opt/${PN}/assets
+
+}
+
+FILES:${PN} += " \
+ /opt/${PN}/assets \
+ ${systemd_system_unitdir}/seco-show-demo.service \
+ "
+
+FILES:${PN}-autostart = "${sysconfdir}/init.d/seco-show-demo"
+
+SYSTEMD_SERVICE:${PN} = "seco-show-demo.service"
+
--
GitLab