diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-12-03 16:10:11 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-12-09 08:34:57 +0000 |
commit | 80ad88fd866526b191754104a6d78a3d33e712b3 (patch) | |
tree | 3d42da476a215592e248ffeb6c24b714679dea0b | |
parent | 9fd94853105aaf0670f0f94386d9a30a6876f115 (diff) | |
download | meta-boot2qt-80ad88fd866526b191754104a6d78a3d33e712b3.tar.gz |
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>
5 files changed, 135 insertions, 0 deletions
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 @@ | |||
1 | [Unit] | ||
2 | Description=Neptune | ||
3 | After=systemd-user-sessions.service | ||
4 | |||
5 | [Service] | ||
6 | ExecStart=/usr/bin/appcontroller /usr/bin/appman -r -c /opt/am/config.yaml -c am-config.yaml --dbus none Main1280x800.qml | ||
7 | Restart=on-failure | ||
8 | WorkingDirectory=/opt/neptune | ||
9 | |||
10 | [Install] | ||
11 | 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 @@ | |||
1 | ############################################################################# | ||
2 | ## | ||
3 | ## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). | ||
4 | ## | ||
5 | ## This file is part of the Qt Enterprise Embedded Scripts of the Qt | ||
6 | ## framework. | ||
7 | ## | ||
8 | ## $QT_BEGIN_LICENSE$ | ||
9 | ## Commercial License Usage Only | ||
10 | ## Licensees holding valid commercial Qt license agreements with Digia | ||
11 | ## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, | ||
12 | ## may use this file in accordance with the terms contained in said license | ||
13 | ## agreement. | ||
14 | ## | ||
15 | ## For further information use the contact form at | ||
16 | ## http://www.qt.io/contact-us. | ||
17 | ## | ||
18 | ## | ||
19 | ## $QT_END_LICENSE$ | ||
20 | ## | ||
21 | ############################################################################# | ||
22 | |||
23 | DESCRIPTION = "Neptune IVI UI" | ||
24 | LICENSE = "GPLv3" | ||
25 | LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=024d61f4545fb889faa57982553ce094" | ||
26 | |||
27 | inherit qt5-module sdk-sources systemd | ||
28 | |||
29 | SRC_URI = " \ | ||
30 | git://codereview.qt-project.org/qt-apps/neptune-ui;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Src/neptune-ui \ | ||
31 | file://neptune.service \ | ||
32 | " | ||
33 | |||
34 | SRCREV = "9ca0b519a13cf98528b66fe737c86139872c1649" | ||
35 | BRANCH = "master" | ||
36 | |||
37 | S = "${WORKDIR}/git" | ||
38 | |||
39 | DEPENDS = "qtbase qtdeclarative" | ||
40 | RDEPENDS_${PN} = "qtapplicationmanager qtivi ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" | ||
41 | |||
42 | do_configure_prepend() { | ||
43 | echo "qml.path = /opt/neptune" >> ${S}/neptuneui.pro | ||
44 | } | ||
45 | |||
46 | do_install_append() { | ||
47 | install -m 0755 -d ${D}${systemd_unitdir}/system | ||
48 | install -m 0644 ${WORKDIR}/neptune.service ${D}${systemd_unitdir}/system/ | ||
49 | |||
50 | install -m 0644 ${S}/Main*.qml ${D}/opt/neptune | ||
51 | install -m 0644 ${S}/am-config.yaml ${D}/opt/neptune | ||
52 | } | ||
53 | |||
54 | PACKAGES =+ "${PN}-apps" | ||
55 | RRECOMMENDS_${PN} += "${PN}-apps" | ||
56 | |||
57 | FILES_${PN}-apps += "/opt/neptune/apps" | ||
58 | FILES_${PN} += "\ | ||
59 | /opt/neptune \ | ||
60 | " | ||
61 | |||
62 | 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 @@ | |||
1 | ############################################################################# | ||
2 | ## | ||
3 | ## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). | ||
4 | ## | ||
5 | ## This file is part of the Qt Enterprise Embedded Scripts of the Qt | ||
6 | ## framework. | ||
7 | ## | ||
8 | ## $QT_BEGIN_LICENSE$ | ||
9 | ## Commercial License Usage Only | ||
10 | ## Licensees holding valid commercial Qt license agreements with Digia | ||
11 | ## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, | ||
12 | ## may use this file in accordance with the terms contained in said license | ||
13 | ## agreement. | ||
14 | ## | ||
15 | ## For further information use the contact form at | ||
16 | ## http://www.qt.io/contact-us. | ||
17 | ## | ||
18 | ## | ||
19 | ## $QT_END_LICENSE$ | ||
20 | ## | ||
21 | ############################################################################# | ||
22 | |||
23 | DESCRIPTION = "Qt component for application lifecycle management" | ||
24 | LICENSE = "GPLv3" | ||
25 | LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=311507adb75495acc0b61d69109485ce" | ||
26 | |||
27 | inherit qt5-module sdk-sources | ||
28 | |||
29 | SRC_URI = " \ | ||
30 | git://codereview.qt-project.org/qt/qtapplicationmanager;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Src/qtapplicationmanager \ | ||
31 | " | ||
32 | |||
33 | SRCREV = "5e40d9fa1ea0d6f8eaaed97e614775078916ee86" | ||
34 | BRANCH = "master" | ||
35 | |||
36 | DEPENDS = "qtbase qtdeclarative libyaml libarchive \ | ||
37 | ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" | ||
38 | |||
39 | S = "${WORKDIR}/git" | ||
40 | |||
41 | EXTRA_QMAKEVARS_PRE += "\ | ||
42 | -config force-singleprocess \ | ||
43 | -config enable-dummydata \ | ||
44 | -config enable-ivi-logging \ | ||
45 | -config install-prefix=/usr \ | ||
46 | -config systemd-workaround \ | ||
47 | " | ||
48 | |||
49 | do_install_append() { | ||
50 | install -m 0755 -d ${D}/opt/am/ | ||
51 | install -m 0644 ${S}/template-opt/am/config.yaml ${D}/opt/am/ | ||
52 | } | ||
53 | |||
54 | FILES_${PN} += "\ | ||
55 | /opt/am \ | ||
56 | ${libdir}/appman \ | ||
57 | ${datadir}/dbus-1" | ||
58 | 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" | |||
30 | RDEPENDS_${PN} += " \ | 30 | RDEPENDS_${PN} += " \ |
31 | b2qt-appcontroller \ | 31 | b2qt-appcontroller \ |
32 | qtivi \ | 32 | qtivi \ |
33 | neptune-ui \ | ||
34 | neptune-ui-apps \ | ||
33 | ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebbrowser', '', d)} \ | 35 | ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebbrowser', '', d)} \ |
34 | gammaray \ | 36 | gammaray \ |
35 | " | 37 | " |
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" | |||
30 | 30 | ||
31 | RDEPENDS_${PN} += " \ | 31 | RDEPENDS_${PN} += " \ |
32 | qtivi-dev \ | 32 | qtivi-dev \ |
33 | libarchive-dev \ | ||
34 | qtapplicationmanager-dev \ | ||
33 | " | 35 | " |