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

2 files changed, 0 insertions, 85 deletions

diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0002-nitrogen6x-update.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0002-nitrogen6x-update.patch
deleted file mode 100644
index dd699d8..0000000
--- a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0002-nitrogen6x-update.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 3d7276b2b27317c5067d2095ea5c3952d11f4390 Mon Sep 17 00:00:00 2001
-From: Rainer Keller <rainer.keller@digia.com>
-Date: Fri, 5 Sep 2014 14:39:50 +0200
-Subject: [PATCH] Add support for update recovery linux
-
----
- board/boundary/nitrogen6x/6x_bootscript-yocto.txt | 61 +++++++++++++++++++++++
- 1 file changed, 61 insertions(+)
-
-diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
-index 5bc6170..4116ed4 100644
---- a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
-+++ b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
-@@ -1,3 +1,67 @@
-+# Boot2Qt update part begin
-+echo "Boot to Qt"
-+mw.b 0x13000000 0x76 1 # v
-+mw.b 0x13000001 0x75 1 # u
-+mw.b 0x13000002 0x74 1 # t
-+mw.b 0x13000003 0x69 1 # i
-+
-+fdtaddr=0x12000000
-+
-+if test "x$boot2qt_update_state" = "x" ; then
-+  setenv boot2qt_update_state valid
-+  saveenv
-+fi
-+
-+# This is a workaround because environment partition is read-only.
-+if fatload mmc 1:1 0x12000000 update/state ; then
-+    if cmp.b 0x12000000 0x13000000 1 ; then
-+        echo "State: Valid"
-+        setenv boot2qt_fat_state valid
-+        setenv boot2qt_update_state valid
-+        saveenv
-+    fi
-+    if cmp.b 0x12000000 0x13000001 1 ; then
-+        echo "State: Update"
-+        setenv boot2qt_fat_state update
-+    fi
-+    if cmp.b 0x12000000 0x13000002 1 ; then
-+        echo "State: Testing"
-+        setenv boot2qt_fat_state testing
-+    fi
-+fi
-+
-+if test "x$boot2qt_fat_state" = "xupdate" || test "x$boot2qt_update_state" = "xinvalid" ; then
-+  setenv boot2qt_update_state testing
-+  saveenv
-+  echo "Recovery linux starting..."
-+  setenv bootargs "console=ttymxc1,115200 vmalloc=400M consoleblank=0 vt.global_cursor_default=0 root=/dev/ram0"
-+
-+  # Guess dtb name
-+  dtbname="imx6";
-+  if itest.s x6S != "x$cpu" ; then
-+    dtbname=${dtbname}q-;
-+  else
-+    dtbname=${dtbname}s-;
-+  fi
-+
-+  if itest.s x == "x$board" ; then
-+    board=sabrelite
-+  fi
-+  dtbname=${dtbname}${board}.dtb;
-+
-+  fatload mmc 1:1 ${loadaddr} update/uImage
-+  fatload mmc 1:1 ${fdtaddr} update/${dtbname}
-+  fatload mmc 1:1 0x13000000 update/uRamdisk
-+  bootm ${loadaddr} 0x13000000 ${fdtaddr}
-+fi
-+
-+if test "x$boot2qt_fat_state" = "xtesting" || test "x$boot2qt_update_state" = "xtesting"; then
-+  setenv boot2qt_update_state invalid
-+  saveenv
-+fi
-+
-+# Boot2Qt update part end
-+
- # Yocto-specifics
- setenv bootpart 2
- setenv bootdir /
--- 
-1.8.5.5
-
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend
index abbc222..a6cee2b 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend
@@ -23,5 +23,4 @@
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += " \
         file://0001-nitrogen6x-update-bootargs.patch \
-        file://0002-nitrogen6x-update.patch \
         "