3 files changed, 13 insertions, 2 deletions

diff --git a/README.adoc b/README.adoc
index 0917e45..a85be18 100644
--- a/README.adoc
+++ b/README.adoc
@@ -44,6 +44,16 @@ and get as a result an "ostree_repo" folder in your images directory (tmp/deploy
 
 Although aglsetup.sh hooks provide reasonable defaults for SOTA-related variables, you may want to tune some of them.
 
+=== 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
 
 Currently supported platforms are
diff --git a/classes/sota_qemux86-64.bbclass b/classes/sota_qemux86-64.bbclass
index 53e0026..666ad6b 100644
--- a/classes/sota_qemux86-64.bbclass
+++ b/classes/sota_qemux86-64.bbclass
@@ -4,7 +4,7 @@ PREFERRED_VERSION_linux-yocto_qemux86-64_sota = "4.4%"
 IMAGE_FSTYPES_remove = "wic"
 
 # U-Boot support for SOTA
-PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot-ota"
+PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot"
 UBOOT_MACHINE_sota = "qemu-x86_defconfig"
 OSTREE_BOOTLOADER ?= "u-boot"
 
diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py
index 253320d..9264616 100644
--- a/lib/oeqa/selftest/cases/updater.py
+++ b/lib/oeqa/selftest/cases/updater.py
@@ -165,7 +165,8 @@ class GrubTests(OESelftestTestCase):
         # Strip off line ending.
         value_str = value.decode()[:-1]
         self.assertEqual(value_str, machine,
-                         'MACHINE does not match hostname: ' + machine + ', ' + value_str)
+                         'MACHINE does not match hostname: ' + machine + ', ' + value_str +
+                         '\nIs tianocore ovmf installed?')
         print(value_str)