summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGatis Paeglis <gatis.paeglis@qt.io>2016-10-21 11:21:28 +0200
committerGatis Paeglis <gatis.paeglis@qt.io>2016-10-24 08:15:04 +0000
commit69a2495f07cfc31c38f6f1bd19a9a66b321818cf (patch)
tree09c46d78a290b59962406156112d251a10585aa8
parent631f875ff918f395b0a76cfa5a34bf600321c62d (diff)
downloadmeta-boot2qt-69a2495f07cfc31c38f6f1bd19a9a66b321818cf.tar.gz
ostree: Disable GObject introspection
We are not using any language bindings of OSTree. We use the C API, so no need for introspection. And re-enable ostree/qtotaupdate now when the build issue is fixed. Task-number: QTBUG-55559 Change-Id: I1a7407d4e6ac3eca1083b9c28ed7aa206e0ed484 Reviewed-by: Samuli Piippo <samuli.piippo@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.bb1
-rw-r--r--recipes/packagegroup/packagegroup-b2qt-embedded-base.bb1
-rw-r--r--recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb1
5 files changed, 5 insertions, 0 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 5a2e31d..6900190 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
@@ -55,6 +55,7 @@ RDEPENDS_${PN} += " \
55 qtimageformats-dev \ 55 qtimageformats-dev \
56 qtlocation-dev \ 56 qtlocation-dev \
57 qtmultimedia-dev \ 57 qtmultimedia-dev \
58 qtotaupdate-dev \
58 qtquickcontrols-dev \ 59 qtquickcontrols-dev \
59 qtquickcontrols2-dev \ 60 qtquickcontrols2-dev \
60 qtsensors-dev \ 61 qtsensors-dev \
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
index dfeddb1..c551cf0 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
@@ -48,6 +48,7 @@ RDEPENDS_${PN} += " \
48 qtimageformats \ 48 qtimageformats \
49 qtlocation \ 49 qtlocation \
50 qtmultimedia \ 50 qtmultimedia \
51 qtotaupdate \
51 qtquickcontrols \ 52 qtquickcontrols \
52 qtquickcontrols2 \ 53 qtquickcontrols2 \
53 qtsensors \ 54 qtsensors \
diff --git a/recipes/ostree/ostree.bb b/recipes/ostree/ostree.bb
index 5061218..5de3852 100644
--- a/recipes/ostree/ostree.bb
+++ b/recipes/ostree/ostree.bb
@@ -74,6 +74,7 @@ EXTRA_OECONF = "--with-dracut \
74 --with-soup \ 74 --with-soup \
75 --with-static-prepare-root \ 75 --with-static-prepare-root \
76 --disable-otmpfile \ 76 --disable-otmpfile \
77 --enable-introspection=no \
77 --enable-libsoup-client-certs" 78 --enable-libsoup-client-certs"
78 79
79do_configure_prepend() { 80do_configure_prepend() {
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
index aa757b2..0e77368 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
@@ -67,6 +67,7 @@ RDEPENDS_${PN} = "\
67 tzdata-europe \ 67 tzdata-europe \
68 atk \ 68 atk \
69 libevent \ 69 libevent \
70 ostree \
70 dracut \ 71 dracut \
71 connman \ 72 connman \
72 ${@base_contains("DISTRO_FEATURES", "wayland", "wayland weston weston-examples", "", d)} \ 73 ${@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 243c4de..31e0cb4 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
@@ -58,6 +58,7 @@ RDEPENDS_${PN} += "\
58 libpq-dev \ 58 libpq-dev \
59 atk-dev \ 59 atk-dev \
60 libevent-dev \ 60 libevent-dev \
61 ostree-dev \
61 ${@base_contains("DISTRO_FEATURES", "wayland", "libxkbcommon-dev libgbm-dev libdrm-dev", "", d)} \ 62 ${@base_contains("DISTRO_FEATURES", "wayland", "libxkbcommon-dev libgbm-dev libdrm-dev", "", d)} \
62 ${@base_contains("DISTRO_FEATURES", "bluetooth", "${BLUEZ}-dev", "", d)} \ 63 ${@base_contains("DISTRO_FEATURES", "bluetooth", "${BLUEZ}-dev", "", d)} \
63 ${MACHINE_EXTRA_INSTALL_SDK} \ 64 ${MACHINE_EXTRA_INSTALL_SDK} \