Merge remote-tracking branch 'ats/rocko' into bugfix/implicit-and-certs-sumo

4 files changed, 7 insertions, 9 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"
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 3a3ca56..8dc4b31 100755
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -99,6 +99,7 @@ FILES_${PN}-examples = " \
                 "
 
 FILES_${PN}-host-tools = " \
+                ${bindir}/aktualizr-repo \
                 ${bindir}/aktualizr_cert_provider \
                 ${bindir}/aktualizr_implicit_writer \
                 ${bindir}/garage-deploy \
diff --git a/recipes-sota/ostree/ostree_git.bb b/recipes-sota/ostree/ostree_git.bb
index cdcb485..afb767f 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"
 
@@ -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"
 
@@ -49,7 +49,7 @@ export STAGING_LIBDIR
 
 do_configure() {
  unset docdir
- NOCONFIGURE=1 ./autogen.sh
+ NOCONFIGURE=1 "${S}/autogen.sh"
  oe_runconf
 }