From 80ad88fd866526b191754104a6d78a3d33e712b3 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@theqtcompany.com>
Date: Thu, 3 Dec 2015 16:10:11 +0200
Subject: Add recipes for qtapplicationmanager and neptune-ui

Include both in the automotive image and set neptune-ui to start at boot up.

Change-Id: I41197deb6a15540b7d27a5235fc1658582667b4a
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
---
 recipes-qt/automotive/neptune-ui/neptune.service   | 11 ++++
 recipes-qt/automotive/neptune-ui_git.bb            | 62 ++++++++++++++++++++++
 recipes-qt/automotive/qtapplicationmanager_git.bb  | 58 ++++++++++++++++++++
 .../packagegroup-b2qt-automotive-addons.bb         |  2 +
 ...gegroup-b2qt-automotive-qt5-toolchain-target.bb |  2 +
 5 files changed, 135 insertions(+)
 create mode 100644 recipes-qt/automotive/neptune-ui/neptune.service
 create mode 100644 recipes-qt/automotive/neptune-ui_git.bb
 create mode 100644 recipes-qt/automotive/qtapplicationmanager_git.bb

diff --git a/recipes-qt/automotive/neptune-ui/neptune.service b/recipes-qt/automotive/neptune-ui/neptune.service
new file mode 100644
index 0000000..9d7881c
--- /dev/null
+++ b/recipes-qt/automotive/neptune-ui/neptune.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Neptune
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/bin/appcontroller /usr/bin/appman -r -c /opt/am/config.yaml -c am-config.yaml --dbus none Main1280x800.qml
+Restart=on-failure
+WorkingDirectory=/opt/neptune
+
+[Install]
+WantedBy=multi-user.target
diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb
new file mode 100644
index 0000000..78cd30c
--- /dev/null
+++ b/recipes-qt/automotive/neptune-ui_git.bb
@@ -0,0 +1,62 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+DESCRIPTION = "Neptune IVI UI"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=024d61f4545fb889faa57982553ce094"
+
+inherit qt5-module sdk-sources systemd
+
+SRC_URI = " \
+    git://codereview.qt-project.org/qt-apps/neptune-ui;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Src/neptune-ui \
+    file://neptune.service \
+    "
+
+SRCREV = "9ca0b519a13cf98528b66fe737c86139872c1649"
+BRANCH = "master"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "qtbase qtdeclarative"
+RDEPENDS_${PN} = "qtapplicationmanager qtivi ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
+
+do_configure_prepend() {
+    echo "qml.path = /opt/neptune" >> ${S}/neptuneui.pro
+}
+
+do_install_append() {
+    install -m 0755 -d ${D}${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/neptune.service ${D}${systemd_unitdir}/system/
+
+    install -m 0644 ${S}/Main*.qml ${D}/opt/neptune
+    install -m 0644 ${S}/am-config.yaml ${D}/opt/neptune
+}
+
+PACKAGES =+ "${PN}-apps"
+RRECOMMENDS_${PN} += "${PN}-apps"
+
+FILES_${PN}-apps += "/opt/neptune/apps"
+FILES_${PN} += "\
+    /opt/neptune \
+    "
+
+SYSTEMD_SERVICE_${PN} = "neptune.service"
diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb
new file mode 100644
index 0000000..3e43b15
--- /dev/null
+++ b/recipes-qt/automotive/qtapplicationmanager_git.bb
@@ -0,0 +1,58 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+DESCRIPTION = "Qt component for application lifecycle management"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=311507adb75495acc0b61d69109485ce"
+
+inherit qt5-module sdk-sources
+
+SRC_URI = " \
+    git://codereview.qt-project.org/qt/qtapplicationmanager;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Src/qtapplicationmanager \
+    "
+
+SRCREV = "5e40d9fa1ea0d6f8eaaed97e614775078916ee86"
+BRANCH = "master"
+
+DEPENDS = "qtbase qtdeclarative libyaml libarchive \
+           ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}"
+
+S = "${WORKDIR}/git"
+
+EXTRA_QMAKEVARS_PRE += "\
+    -config force-singleprocess \
+    -config enable-dummydata \
+    -config enable-ivi-logging \
+    -config install-prefix=/usr \
+    -config systemd-workaround \
+    "
+
+do_install_append() {
+    install -m 0755 -d ${D}/opt/am/
+    install -m 0644 ${S}/template-opt/am/config.yaml ${D}/opt/am/
+}
+
+FILES_${PN} += "\
+    /opt/am \
+    ${libdir}/appman \
+    ${datadir}/dbus-1"
+FILES_${PN}-dbg += "${libdir}/appman/.debug"
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
index 9bc6877..839266f 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
@@ -30,6 +30,8 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 RDEPENDS_${PN} += " \
     b2qt-appcontroller \
     qtivi \
+    neptune-ui \
+    neptune-ui-apps \
     ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebbrowser', '', d)} \
     gammaray \
     "
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb
index 5f6f32f..4c7de92 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb
@@ -30,4 +30,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
 RDEPENDS_${PN} += " \
     qtivi-dev \
+    libarchive-dev \
+    qtapplicationmanager-dev \
     "
-- 
cgit v1.2.3-54-g00ecf