summaryrefslogtreecommitdiffstats
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 15:58:12 +0100
commit91488e9630d0871a2ef7c786af67903776a8711f (patch)
tree4433e9ccb134469b7765589bffd016d161f7f191
parent837670e8ea2265010a8e0c8eb9ef777d17655ba9 (diff)
downloadpoky-91488e9630d0871a2ef7c786af67903776a8711f.tar.gz
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] (From OE-Core rev: aa215c12d729c001ad3b8b98a7e203a9ad192211) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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):
197 except KeyError: 197 except KeyError:
198 msger.error("bootimg-efi requires a loader, none specified") 198 msger.error("bootimg-efi requires a loader, none specified")
199 199
200 startup = os.path.join(bootimg_dir, "startup.nsh")
201 if os.path.exists(startup):
202 cp_cmd = "cp %s %s/" % (startup, hdddir)
203 exec_cmd(cp_cmd, True)
204
200 du_cmd = "du -bks %s" % hdddir 205 du_cmd = "du -bks %s" % hdddir
201 out = exec_cmd(du_cmd) 206 out = exec_cmd(du_cmd)
202 blocks = int(out.split()[0]) 207 blocks = int(out.split()[0])