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 /meta-boot2qt/recipes-qt | |
parent | 1069a97201703c783a5e69064fedd4bf4eeb10db (diff) | |
download | meta-boot2qt-e4a6fd875292750090a4cb3ac199adba232044ea.tar.gz |
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>
Diffstat (limited to 'meta-boot2qt/recipes-qt')
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 de87a1a..1e8ac12 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 | |||
55 | 55 | ||
56 | S = "${WORKDIR}/git/basicsuite" | 56 | S = "${WORKDIR}/git/basicsuite" |
57 | 57 | ||
58 | DEPENDS = "qtbase qtdeclarative qtxmlpatterns qtquickcontrols2 qtgraphicaleffects qtmultimedia qtcharts qtlocation \ | 58 | DEPENDS = " \ |
59 | ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" | 59 | qtbase qtdeclarative qtxmlpatterns qtquickcontrols2 qtgraphicaleffects qtmultimedia qtcharts qtlocation \ |
60 | ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \ | ||
61 | ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'qtdeclarative-native', '', d)} \ | ||
62 | " | ||
60 | 63 | ||
61 | do_install_append() { | 64 | do_install_append() { |
62 | # we only need plugins from the demos | 65 | # we only need plugins from the demos |
@@ -111,3 +114,6 @@ FILES_${PN} += " \ | |||
111 | FILES_${PN}-dbg += " \ | 114 | FILES_${PN}-dbg += " \ |
112 | /data/user/qt/qmlplugins/*/.debug/ \ | 115 | /data/user/qt/qmlplugins/*/.debug/ \ |
113 | " | 116 | " |
117 | FILES_${PN}-staticdev += " \ | ||
118 | /data/user/qt/qmlplugins/*/*.a \ | ||
119 | " | ||
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 41a924a..aa597e8 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 += " \ | |||
43 | file://ebikedata.service \ | 43 | file://ebikedata.service \ |
44 | " | 44 | " |
45 | 45 | ||
46 | SRCREV = "6187ed3df6f8f749259ed059e56ba0ed85dea8fd" | 46 | SRCREV = "56d6c566fc434c159d573eba07a4397e5aea3638" |
47 | 47 | ||
48 | DEPENDS = "qtbase qtdeclarative qtquickcontrols2 \ | 48 | DEPENDS = "\ |
49 | ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" | 49 | qtbase qtdeclarative qtquickcontrols2 \ |
50 | ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \ | ||
51 | ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'qtdeclarative-native qtvirtualkeyboard qtdeviceutilities', '', d)} \ | ||
52 | " | ||
50 | 53 | ||
51 | do_install_append() { | 54 | do_install_append() { |
52 | install -m 0755 -d ${D}${sysconfdir}/init.d | 55 | 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 2e192ce..f445233 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" | |||
39 | 39 | ||
40 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 40 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
41 | 41 | ||
42 | SRCREV = "e1ff105e6e6f518ac35afc315c67ad1a009e510e" | 42 | SRCREV = "1dabfa51cb834efd85ccb60e70e2ce3558b4deaf" |
43 | 43 | ||
44 | DEPENDS = "qtbase qtdeclarative qtconnectivity" | 44 | DEPENDS = "\ |
45 | qtbase qtdeclarative qtconnectivity qtdeclarative-native \ | ||
46 | ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'qtsvg qtvirtualkeyboard', '', d)} \ | ||
47 | " | ||