diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-08-26 11:06:50 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-12 12:34:24 +0000 |
commit | 666bc23e22d1a03572cf35d31e58ea903b4051c1 (patch) | |
tree | c9c6b0ee893cf64ed9357dff6df34c2f6c7908bf | |
parent | 0014d9824b530f7e796b7f93883d0402b4269d45 (diff) | |
download | meta-boot2qt-666bc23e22d1a03572cf35d31e58ea903b4051c1.tar.gz |
ostree: remove ostree/qtotaupdate temporarily
Compilation fails with GCC 5.3, so temporarily remove the components.
Task-number: QTBUG-55559
Change-Id: Ieccf494a5c8ed210f2796d464bb3054d9b2051d5
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
4 files changed, 0 insertions, 4 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 652c931..cd1f2d8 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb | |||
@@ -53,7 +53,6 @@ RDEPENDS_${PN} += " \ | |||
53 | qtimageformats-dev \ | 53 | qtimageformats-dev \ |
54 | qtlocation-dev \ | 54 | qtlocation-dev \ |
55 | qtmultimedia-dev \ | 55 | qtmultimedia-dev \ |
56 | qtotaupdate-dev \ | ||
57 | qtquickcontrols-dev \ | 56 | qtquickcontrols-dev \ |
58 | qtquickcontrols2-dev \ | 57 | qtquickcontrols2-dev \ |
59 | qtsensors-dev \ | 58 | qtsensors-dev \ |
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb index 8138b3e..06de528 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb | |||
@@ -48,7 +48,6 @@ RDEPENDS_${PN} += " \ | |||
48 | qtimageformats \ | 48 | qtimageformats \ |
49 | qtlocation \ | 49 | qtlocation \ |
50 | qtmultimedia \ | 50 | qtmultimedia \ |
51 | qtotaupdate \ | ||
52 | qtquickcontrols \ | 51 | qtquickcontrols \ |
53 | qtquickcontrols2 \ | 52 | qtquickcontrols2 \ |
54 | qtsensors \ | 53 | qtsensors \ |
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb index 0e77368..aa757b2 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb | |||
@@ -67,7 +67,6 @@ RDEPENDS_${PN} = "\ | |||
67 | tzdata-europe \ | 67 | tzdata-europe \ |
68 | atk \ | 68 | atk \ |
69 | libevent \ | 69 | libevent \ |
70 | ostree \ | ||
71 | dracut \ | 70 | dracut \ |
72 | connman \ | 71 | connman \ |
73 | ${@base_contains("DISTRO_FEATURES", "wayland", "wayland weston weston-examples", "", d)} \ | 72 | ${@base_contains("DISTRO_FEATURES", "wayland", "wayland weston weston-examples", "", d)} \ |
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb index 31e0cb4..243c4de 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb | |||
@@ -58,7 +58,6 @@ RDEPENDS_${PN} += "\ | |||
58 | libpq-dev \ | 58 | libpq-dev \ |
59 | atk-dev \ | 59 | atk-dev \ |
60 | libevent-dev \ | 60 | libevent-dev \ |
61 | ostree-dev \ | ||
62 | ${@base_contains("DISTRO_FEATURES", "wayland", "libxkbcommon-dev libgbm-dev libdrm-dev", "", d)} \ | 61 | ${@base_contains("DISTRO_FEATURES", "wayland", "libxkbcommon-dev libgbm-dev libdrm-dev", "", d)} \ |
63 | ${@base_contains("DISTRO_FEATURES", "bluetooth", "${BLUEZ}-dev", "", d)} \ | 62 | ${@base_contains("DISTRO_FEATURES", "bluetooth", "${BLUEZ}-dev", "", d)} \ |
64 | ${MACHINE_EXTRA_INSTALL_SDK} \ | 63 | ${MACHINE_EXTRA_INSTALL_SDK} \ |