From de715c72f99850dc959ecf9282fc356deebd67af Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 19 Nov 2015 16:30:05 +0200 Subject: automotive: create new automotive specific image Reuse most parts from b2qt image, only difference is the demo addons which will be different for the automotive image. For now, add no demo app, so image boots to empty screen. Change-Id: I67bbe8724422c9ea86dae6e4d5f8f38d3d567ba1 Reviewed-by: Teemu Holappa --- recipes-qt/images/b2qt-automotive-qt5-image.bb | 49 +++++++++++++++++++ recipes-qt/images/b2qt-embedded-qt5-image.bb | 4 +- .../packagegroup-b2qt-automotive-addons.bb | 32 +++++++++++++ .../packagegroup-b2qt-embedded-addons.bb | 35 ++++++++++++++ .../packagegroup-b2qt-embedded-qt5.bb | 52 -------------------- .../packagegroups/packagegroup-b2qt-qt5-modules.bb | 55 ++++++++++++++++++++++ 6 files changed, 173 insertions(+), 54 deletions(-) create mode 100644 recipes-qt/images/b2qt-automotive-qt5-image.bb create mode 100644 recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb create mode 100644 recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb delete mode 100644 recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb create mode 100644 recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb diff --git a/recipes-qt/images/b2qt-automotive-qt5-image.bb b/recipes-qt/images/b2qt-automotive-qt5-image.bb new file mode 100644 index 0000000..6aafc77 --- /dev/null +++ b/recipes-qt/images/b2qt-automotive-qt5-image.bb @@ -0,0 +1,49 @@ +############################################################################# +## +## 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 = "B2Qt Automotive Qt5 image" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9" +PR = "r0" + +IMAGE_FEATURES += "\ + package-management \ + ssh-server-dropbear \ + tools-debug \ + debug-tweaks \ + hwcodecs \ + " + +inherit core-image +inherit bootfs-image + +MACHINE_EXTRA_INSTALL_QT ?= "" + +IMAGE_INSTALL += "\ + ${MACHINE_EXTRA_INSTALL_QT} \ + packagegroup-b2qt-embedded-base \ + packagegroup-b2qt-embedded-tools \ + ${@base_contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \ + packagegroup-b2qt-qt5-modules \ + packagegroup-b2qt-automotive-addons \ + " diff --git a/recipes-qt/images/b2qt-embedded-qt5-image.bb b/recipes-qt/images/b2qt-embedded-qt5-image.bb index 924ba61..8c986ac 100644 --- a/recipes-qt/images/b2qt-embedded-qt5-image.bb +++ b/recipes-qt/images/b2qt-embedded-qt5-image.bb @@ -44,6 +44,6 @@ IMAGE_INSTALL += "\ packagegroup-b2qt-embedded-tools \ ${@base_contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \ ${@base_contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \ - packagegroup-b2qt-embedded-qt5 \ - packagegroup-b2qt-embedded-qt5-addons \ + packagegroup-b2qt-qt5-modules \ + packagegroup-b2qt-embedded-addons \ " diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb new file mode 100644 index 0000000..a318d0e --- /dev/null +++ b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb @@ -0,0 +1,32 @@ +############################################################################# +## +## 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 = "Automotive specific Qt packages" +LICENSE = "QtEnterprise" + +inherit packagegroup + +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" + +RDEPENDS_${PN} += " \ + b2qt-appcontroller \ + " diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb new file mode 100644 index 0000000..006702a --- /dev/null +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb @@ -0,0 +1,35 @@ +############################################################################# +## +## 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 = "Device Creation specific Qt packages" +LICENSE = "QtEnterprise" + +inherit packagegroup + +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" + +RDEPENDS_${PN} += " \ + b2qt-appcontroller \ + b2qt-utils \ + b2qt-launcher \ + b2qt-demos \ + " diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb deleted file mode 100644 index 861f61a..0000000 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb +++ /dev/null @@ -1,52 +0,0 @@ -############################################################################# -## -## 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 = "Qt5 modules" -LICENSE = "QtEnterprise" - -inherit packagegroup - -PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" - -RDEPENDS_${PN} += " \ - qt3d \ - qtbase \ - qtbase-fonts \ - qtcanvas3d \ - qtconnectivity \ - qtdeclarative \ - qtdeclarative-tools \ - qtgraphicaleffects \ - qtimageformats \ - qtlocation \ - qtmultimedia \ - qtsensors \ - qtserialport \ - qtsvg \ - qttools \ - ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \ - qtwebsockets \ - qtwebchannel \ - qtxmlpatterns \ - qtquickcontrols \ - " diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb new file mode 100644 index 0000000..cc4784a --- /dev/null +++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb @@ -0,0 +1,55 @@ +############################################################################# +## +## 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 = "Qt5 modules" +LICENSE = "QtEnterprise" + +inherit packagegroup + +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" + +RDEPENDS_${PN} += " \ + qt3d \ + qtbase \ + qtbase-fonts \ + qtcanvas3d \ + qtcharts \ + qtconnectivity \ + qtdatavisualization \ + qtdeclarative \ + qtdeclarative-tools \ + qtgraphicaleffects \ + qtimageformats \ + qtlocation \ + qtmultimedia \ + qtquickcontrols \ + qtsensors \ + qtserialport \ + qtsvg \ + qttools \ + ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \ + qtwebsockets \ + qtwebchannel \ + qtxmlpatterns \ + qtvirtualkeyboard \ + " -- cgit v1.2.3-54-g00ecf