Merge remote-tracking branch 'origin/dizzy' into dev

* origin/dizzy:
  Use openembedded mirror from github
  nitrogen6x: add u-boot binary back to the image
  ostree: Add TLS support
  ostree: patch upstream project
  ostree: Add GNUPG to runtime dependencies.
  Revert "Build nativesdk-ostree"
  Remove unused b2qt-update-framework

Conflicts:
	conf/distro/include/nitrogen6x.conf
	recipes/ostree/ostree.bb
	scripts/manifest.xml
	scripts/manifest_fido.xml

Change-Id: Ie3884fa026fc8b8d7d05a9bff4b2beb124e4fd03

1 files changed, 14 insertions, 5 deletions

diff --git a/recipes/ostree/ostree.bb b/recipes/ostree/ostree.bb
index acd8305..49060b6 100644
--- a/recipes/ostree/ostree.bb
+++ b/recipes/ostree/ostree.bb
@@ -28,13 +28,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 inherit autotools pkgconfig systemd
 
 SRC_URI = " \
-    git://github.com/GNOME/ostree.git;tag=v2015.9 \
-    file://0001-Don-t-require-boot-uEnv.txt-for-u-boot-support.patch \
+    git://github.com/GNOME/ostree.git \
+    file://0001-Allow-updating-files-on-the-boot-partition.patch \
+    file://0002-u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch \
+    file://0003-Allow-updating-files-in-root-of-boot.patch \
     "
 
+SRCREV = "efdb4d8f443768e59529c299290bee8b1f8f93c3"
+
 S = "${WORKDIR}/git"
 
 DEPENDS = "glib-2.0 e2fsprogs gpgme attr libsoup-2.4 libgsystem libassuan xz"
+RRECOMMENDS_${PN} += "gnupg"
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
 PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,,,"
@@ -42,7 +47,13 @@ PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/
 SYSTEMD_SERVICE_${PN} = "ostree-prepare-root.service ostree-remount.service"
 FILES_${PN} += "${systemd_unitdir}/system/"
 
-EXTRA_OECONF = "--with-dracut --without-selinux --without-libarchive --with-grub2=no --enable-gtk-doc-html=no"
+EXTRA_OECONF = "--with-dracut \
+                --without-selinux \
+                --without-libarchive \
+                --with-grub2=no \
+                --enable-gtk-doc-html=no \
+                --with-soup \
+                --enable-libsoup-client-certs"
 
 do_configure_prepend() {
     cd ${S}
@@ -57,5 +68,3 @@ do_install_append() {
     # this of course is a broken configure.ac logic.
     rm -rf ${D}${libdir}/dracut/
 }
-
-BBCLASSEXTEND = "native nativesdk"