5 files changed, 16 insertions, 20 deletions

diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc
index 7438424..ea1ca95 100644
--- a/conf/distro/sota.conf.inc
+++ b/conf/distro/sota.conf.inc
@@ -5,6 +5,9 @@
 # require conf/distro/sota.conf.inc
 
 DISTRO_FEATURES_append = " sota"
+DISTRO_FEATURES_NATIVE_append = " sota"
 INHERIT += " sota"
 # Prelinking increases the size of downloads and causes build errors
 USER_CLASSES_remove = "image-prelink"
+
+HOSTTOOLS_append = " sync sha256sum"
diff --git a/recipes-bsp/u-boot/u-boot_2016.11.bb b/recipes-bsp/u-boot/u-boot_2016.11.bb
deleted file mode 100644
index e6e1fcf..0000000
--- a/recipes-bsp/u-boot/u-boot_2016.11.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require recipes-bsp/u-boot/u-boot.inc
-
-DEPENDS += "dtc-native"
-
-SRCREV = "5ea3e51fc481613a8dee8c02848d1b42c81ad892"
-
-PV = "v2016.11+git${SRCPV}"
-
-#This patch is not compliant with u-boot 2016.11
-#Version of u-boot from yocto 2.2 Morty is 2016.03 from:
-# meta/recipes-bsp/u-boot/u-boot_2016.03.bb
-SRC_URI_remove_raspberrypi3 = "file://0003-Include-lowlevel_init.o-for-rpi2.patch"
-SRC_URI_remove_raspberrypi2 = "file://0003-Include-lowlevel_init.o-for-rpi2.patch"
diff --git a/recipes-support/glib-networking/glib-networking_%.bbappend b/recipes-support/glib-networking/glib-networking_%.bbappend
index fccb949..1c4fe19 100644
--- a/recipes-support/glib-networking/glib-networking_%.bbappend
+++ b/recipes-support/glib-networking/glib-networking_%.bbappend
@@ -1 +1,6 @@
-BBCLASSEXTEND_append_sota = " native"
+BBCLASSEXTEND_append_sota = " native nativesdk"
+
+# Hackery to prevent relocatable_native_pcfiles from crashing
+do_install_append_class-native () {
+        rmdir ${D}${libdir}/pkgconfig
+}
diff --git a/recipes-support/libsoup/libsoup-2.4_%.bbappend b/recipes-support/libsoup/libsoup-2.4_%.bbappend
index ce4df6d..18383f1 100644
--- a/recipes-support/libsoup/libsoup-2.4_%.bbappend
+++ b/recipes-support/libsoup/libsoup-2.4_%.bbappend
@@ -1,3 +1,3 @@
-BBCLASSEXTEND_append_sota = " native"
+BBCLASSEXTEND_append_sota = " native nativesdk"
 
 DEPENDS_append_class-native = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ' glib-networking-native', ' ', d)}"
diff --git a/scripts/lib/wic/plugins/source/otaimage.py b/scripts/lib/wic/plugins/source/otaimage.py
index dc507a8..eef0bb4 100644
--- a/scripts/lib/wic/plugins/source/otaimage.py
+++ b/scripts/lib/wic/plugins/source/otaimage.py
@@ -15,11 +15,12 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+import logging
 import os
+import sys
 
-from wic import msger
 from wic.pluginbase import SourcePlugin
-from wic.utils.oe.misc import get_bitbake_var
+from wic.utils.misc import get_bitbake_var
 
 class OTAImagePlugin(SourcePlugin):
     """
@@ -57,12 +58,12 @@ class OTAImagePlugin(SourcePlugin):
         """
         bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE")
         if not bootimg_dir:
-            msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n")
+            logger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n")
 
-        msger.debug('Bootimg dir: %s' % bootimg_dir)
+        logger.debug('Bootimg dir: %s' % bootimg_dir)
 
         src = bootimg_dir + "/" + get_bitbake_var("IMAGE_LINK_NAME") + ".otaimg"
 
-        msger.debug('Preparing partition using image %s' % (src))
+        logger.debug('Preparing partition using image %s' % (src))
         part.prepare_rootfs_from_fs_image(cr_workdir, src, "")