summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2017-11-20 09:44:54 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2017-11-20 08:30:33 +0000
commite497ed8ab07f0fb11122612cf6add98d72960ec9 (patch)
tree03ae37e9605f818205c6de3991bd0175df413ce3
parent2ed6e25343501b55823b56111cc21111921972c9 (diff)
downloadmeta-boot2qt-e497ed8ab07f0fb11122612cf6add98d72960ec9.tar.gz
ota: fix build issue and add back to image
Add needed depedency to ostree and add qtotaupdate module back to image and toolchain. Task-number: QTBUG-64542 Change-Id: Ia98527d309de8289466a99551effd87f6b1b36b9 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r--recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb1
-rw-r--r--recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb1
-rw-r--r--recipes/ostree/ostree.bb2
3 files changed, 3 insertions, 1 deletions
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
index 98ec531..7a22951 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
@@ -57,6 +57,7 @@ RDEPENDS_${PN} += " \
57 qtlocation-dev \ 57 qtlocation-dev \
58 qtmultimedia-dev \ 58 qtmultimedia-dev \
59 qtnetworkauth-dev \ 59 qtnetworkauth-dev \
60 qtotaupdate-dev \
60 qtquickcontrols-dev \ 61 qtquickcontrols-dev \
61 qtquickcontrols2-dev \ 62 qtquickcontrols2-dev \
62 qtremoteobjects-dev \ 63 qtremoteobjects-dev \
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
index f07315c..8ad37d8 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
@@ -49,6 +49,7 @@ RDEPENDS_${PN} += " \
49 qtlocation \ 49 qtlocation \
50 qtmultimedia \ 50 qtmultimedia \
51 qtnetworkauth \ 51 qtnetworkauth \
52 qtotaupdate \
52 qtquickcontrols \ 53 qtquickcontrols \
53 qtquickcontrols2 \ 54 qtquickcontrols2 \
54 qtremoteobjects \ 55 qtremoteobjects \
diff --git a/recipes/ostree/ostree.bb b/recipes/ostree/ostree.bb
index 267289a..e4c8076 100644
--- a/recipes/ostree/ostree.bb
+++ b/recipes/ostree/ostree.bb
@@ -52,7 +52,7 @@ SRCREV = "8ece4d6d51bdbe3e41ab318259276bb83e553aa0"
52 52
53S = "${WORKDIR}/git" 53S = "${WORKDIR}/git"
54 54
55DEPENDS = "glib-2.0 e2fsprogs gpgme attr libsoup-2.4 libassuan xz systemd" 55DEPENDS = "glib-2.0 glib-2.0-native e2fsprogs gpgme attr libsoup-2.4 libassuan xz systemd"
56# Bash is needed by the shipped dracut module. This dracut module is used to generate initramfs image. 56# Bash is needed by the shipped dracut module. This dracut module is used to generate initramfs image.
57# The production image do not require bash for proper working. 57# The production image do not require bash for proper working.
58RDEPENDS_${PN} += "bash" 58RDEPENDS_${PN} += "bash"