diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-06-29 13:17:19 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-07-05 09:36:34 +0000 |
| commit | e4a6fd875292750090a4cb3ac199adba232044ea (patch) | |
| tree | e72451e4dc09e31972ab30b50f1482795d85af21 | |
| parent | 1069a97201703c783a5e69064fedd4bf4eeb10db (diff) | |
Add support for static builds
Necessary recipe changes to support building image with static Qt5.
Boot2Qt Launcher will not be fully functional, but the image can
can be built.
Task-number: QTBUG-69002
Change-Id: I863c40d7b6b3f432b9f78c0477b26030f4818733
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
3 files changed, 19 insertions, 7 deletions
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb index de87a1a6..1e8ac124 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb @@ -55,8 +55,11 @@ SRC_URI[video2.sha256sum] = "651e0b4d2b3272dc10bfc9edba4f0c1a7084cd087c75e8a098f S = "${WORKDIR}/git/basicsuite" -DEPENDS = "qtbase qtdeclarative qtxmlpatterns qtquickcontrols2 qtgraphicaleffects qtmultimedia qtcharts qtlocation \ - ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" +DEPENDS = " \ + qtbase qtdeclarative qtxmlpatterns qtquickcontrols2 qtgraphicaleffects qtmultimedia qtcharts qtlocation \ + ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'qtdeclarative-native', '', d)} \ + " do_install_append() { # we only need plugins from the demos @@ -111,3 +114,6 @@ FILES_${PN} += " \ FILES_${PN}-dbg += " \ /data/user/qt/qmlplugins/*/.debug/ \ " +FILES_${PN}-staticdev += " \ + /data/user/qt/qmlplugins/*/*.a \ + " diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb index 41a924a4..aa597e8a 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb @@ -43,10 +43,13 @@ SRC_URI += " \ file://ebikedata.service \ " -SRCREV = "6187ed3df6f8f749259ed059e56ba0ed85dea8fd" +SRCREV = "56d6c566fc434c159d573eba07a4397e5aea3638" -DEPENDS = "qtbase qtdeclarative qtquickcontrols2 \ - ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" +DEPENDS = "\ + qtbase qtdeclarative qtquickcontrols2 \ + ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'qtdeclarative-native qtvirtualkeyboard qtdeviceutilities', '', d)} \ + " do_install_append() { install -m 0755 -d ${D}${sysconfdir}/init.d diff --git a/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb b/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb index 2e192ce9..f4452332 100644 --- a/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb +++ b/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb @@ -39,6 +39,9 @@ PACKAGECONFIG[wpasupplicant] = "CONFIG+=wpasupplicant,,wpa-supplicant" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "e1ff105e6e6f518ac35afc315c67ad1a009e510e" +SRCREV = "1dabfa51cb834efd85ccb60e70e2ce3558b4deaf" -DEPENDS = "qtbase qtdeclarative qtconnectivity" +DEPENDS = "\ + qtbase qtdeclarative qtconnectivity qtdeclarative-native \ + ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'qtsvg qtvirtualkeyboard', '', d)} \ + " |