2 files changed, 8 insertions, 5 deletions

diff --git a/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend b/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend
index 2304ab4..7cce775 100644
--- a/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend
+++ b/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend
@@ -1,10 +1,10 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS_prepend_sota := "${THISDIR}/${BPN}:"
 
-SRC_URI += "file://nfs-home-mount.service"
+SRC_URI_append_sota = " file://nfs-home-mount.service"
 
-SYSTEMD_SERVICE_${PN} += "nfs-home-mount.service"
+SYSTEMD_SERVICE_${PN}_append_sota = " nfs-home-mount.service"
 
-CONFFILES_${PN}-client += "${localstatedir}/local/lib"
+CONFFILES_${PN}-client_append_sota = " ${localstatedir}/local/lib"
 
 do_install_append_sota () {
     install -d ${D}${localstatedir}/local
diff --git a/scripts/qemucommand.py b/scripts/qemucommand.py
index 30929ac..9658fcd 100644
--- a/scripts/qemucommand.py
+++ b/scripts/qemucommand.py
@@ -75,7 +75,10 @@ class QemuCommand(object):
         if args.efi:
             self.bios = 'OVMF.fd'
         elif self.enable_u_boot:
-            uboot_path = abspath(join(args.dir, self.machine, 'u-boot-qemux86-64.rom'))
+            if args.bootloader:
+                uboot_path = args.bootloader
+            else:
+                uboot_path = abspath(join(args.dir, self.machine, 'u-boot-qemux86-64.rom'))
             if self.overlay:
                 new_uboot_path = self.overlay + '.u-boot.rom'
                 if not exists(self.overlay):