From 69a2495f07cfc31c38f6f1bd19a9a66b321818cf Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Fri, 21 Oct 2016 11:21:28 +0200 Subject: 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 --- .../packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb | 1 + recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb | 1 + recipes/ostree/ostree.bb | 1 + recipes/packagegroup/packagegroup-b2qt-embedded-base.bb | 1 + recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb | 1 + 5 files changed, 5 insertions(+) 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} += " \ qtimageformats-dev \ qtlocation-dev \ qtmultimedia-dev \ + qtotaupdate-dev \ qtquickcontrols-dev \ qtquickcontrols2-dev \ 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} += " \ qtimageformats \ qtlocation \ qtmultimedia \ + qtotaupdate \ qtquickcontrols \ qtquickcontrols2 \ 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 \ --with-soup \ --with-static-prepare-root \ --disable-otmpfile \ + --enable-introspection=no \ --enable-libsoup-client-certs" do_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} = "\ tzdata-europe \ atk \ libevent \ + ostree \ dracut \ connman \ ${@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} += "\ libpq-dev \ atk-dev \ libevent-dev \ + ostree-dev \ ${@base_contains("DISTRO_FEATURES", "wayland", "libxkbcommon-dev libgbm-dev libdrm-dev", "", d)} \ ${@base_contains("DISTRO_FEATURES", "bluetooth", "${BLUEZ}-dev", "", d)} \ ${MACHINE_EXTRA_INSTALL_SDK} \ -- cgit v1.2.3-54-g00ecf