summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2016-05-25 13:31:52 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-30 09:30:31 +0100
commitaa215c12d729c001ad3b8b98a7e203a9ad192211 (patch)
tree3de2dfb101f05e08971f67a01c005725e6cb3cb7
parent43ca968c5af129a990625923bc28131b8701386d (diff)
downloadopenembedded-core-aa215c12d729c001ad3b8b98a7e203a9ad192211.tar.gz
openembedded-core-aa215c12d729c001ad3b8b98a7e203a9ad192211.tar.bz2
openembedded-core-aa215c12d729c001ad3b8b98a7e203a9ad192211.zip
wic: bootimg-efi: include startup.nsh if it's available
We want the system to boot on its own, rather than the user having to manually input the correct file at the EFI prompt. [YOCTO #9556] Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-efi.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index a4734c9b36..ec13f6d2e5 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -197,6 +197,11 @@ class BootimgEFIPlugin(SourcePlugin):
except KeyError:
msger.error("bootimg-efi requires a loader, none specified")
+ startup = os.path.join(bootimg_dir, "startup.nsh")
+ if os.path.exists(startup):
+ cp_cmd = "cp %s %s/" % (startup, hdddir)
+ exec_cmd(cp_cmd, True)
+
du_cmd = "du -bks %s" % hdddir
out = exec_cmd(du_cmd)
blocks = int(out.split()[0])