From cf36fad0b1f2542f04d1b4800c0a4cd593c51dcf Mon Sep 17 00:00:00 2001
From: Laurent Bonnans <laurent.bonnans@here.com>
Date: Tue, 22 May 2018 17:53:08 +0200
Subject: Include fix for qemu in sota_qemux86-64.bbclass

---
 README.adoc                     | 6 ------
 classes/sota_qemux86-64.bbclass | 3 +++
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/README.adoc b/README.adoc
index c47dd1d..75ee9ae 100644
--- a/README.adoc
+++ b/README.adoc
@@ -53,12 +53,6 @@ Although `aglsetup.sh` hooks provide reasonable defaults for SOTA-related variab
 
 === Build problems
 
-Multilib systems may require adding this line to `local.conf`:
-
-....
-HOSTTOOLS += "x86_64-linux-gnu-gcc"
-....
-
 Ubuntu users that encounter an error due to missing `Python.h` should install `libpython2.7-dev` on their host machine.
 
 == Supported boards
diff --git a/classes/sota_qemux86-64.bbclass b/classes/sota_qemux86-64.bbclass
index 15b2043..82efe52 100644
--- a/classes/sota_qemux86-64.bbclass
+++ b/classes/sota_qemux86-64.bbclass
@@ -9,3 +9,6 @@ OSTREE_INITRAMFS_FSTYPES ?= "ext4.gz"
 OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/hda"
 
 IMAGE_ROOTFS_EXTRA_SPACE = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', '65536', '', d)}"
+
+# fix for u-boot/swig build issue
+HOSTTOOLS_NONFATAL += "x86_64-linux-gnu-gcc"
-- 
cgit v1.2.3-54-g00ecf


From a1fbc691aefbc2b29476b5561bd2e7220217235b Mon Sep 17 00:00:00 2001
From: Patrick Vacek <patrickvacek@gmail.com>
Date: Wed, 23 May 2018 14:49:02 +0200
Subject: ostree: Don't use autotools-brokensep.

The only reason we needed it was because of a relative path that I've
now made absolute.
---
 recipes-sota/ostree/ostree_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-sota/ostree/ostree_git.bb b/recipes-sota/ostree/ostree_git.bb
index cdcb485..bfe16e9 100644
--- a/recipes-sota/ostree/ostree_git.bb
+++ b/recipes-sota/ostree/ostree_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "Tool for managing bootable, immutable, versioned filesystem trees"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 
-inherit autotools-brokensep pkgconfig systemd gobject-introspection
+inherit autotools pkgconfig systemd gobject-introspection
 
 INHERIT_remove_class-native = "systemd"
 
@@ -49,7 +49,7 @@ export STAGING_LIBDIR
 
 do_configure() {
  unset docdir
- NOCONFIGURE=1 ./autogen.sh
+ NOCONFIGURE=1 "${S}/autogen.sh"
  oe_runconf
 }
 
-- 
cgit v1.2.3-54-g00ecf


From 4b97ad0dce72cede71167e9785cd77b1ddfdcb36 Mon Sep 17 00:00:00 2001
From: Phil Wise <phil@advancedtelematic.com>
Date: Mon, 28 May 2018 12:46:22 +0200
Subject: Get ready for aktualizr-repo tool

---
 recipes-sota/aktualizr/aktualizr_git.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 2c0d59f..f55eca8 100755
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -98,6 +98,7 @@ FILES_${PN}-examples = " \
                 "
 
 FILES_${PN}-host-tools = " \
+                ${bindir}/aktualizr-repo \
                 ${bindir}/aktualizr_cert_provider \
                 ${bindir}/aktualizr_implicit_writer \
                 ${bindir}/garage-deploy \
-- 
cgit v1.2.3-54-g00ecf


From cc091e9d9e7fc9e921e9b6ca5fb49bb1cc32c1eb Mon Sep 17 00:00:00 2001
From: Phil Wise <philip.wise@here.com>
Date: Fri, 1 Jun 2018 09:05:03 +0200
Subject: Bump PR to flush old sstate caches that were built in-tree

The change that removes autotools-brokensep breaks people who have old
sstate caches that were built in-tree. Bump the PR to flush these out of
the system.
---
 recipes-sota/ostree/ostree_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-sota/ostree/ostree_git.bb b/recipes-sota/ostree/ostree_git.bb
index bfe16e9..afb767f 100644
--- a/recipes-sota/ostree/ostree_git.bb
+++ b/recipes-sota/ostree/ostree_git.bb
@@ -11,7 +11,7 @@ SRC_URI = "gitsm://github.com/ostreedev/ostree.git;branch=master"
 SRCREV="854a823e05d6fe8b610c02c2a71eaeb2bf1e98a6"
 
 PV = "v2017.13"
-PR = "1"
+PR = "2"
 
 S = "${WORKDIR}/git"
 
-- 
cgit v1.2.3-54-g00ecf