summaryrefslogtreecommitdiffstats
path: root/scripts/lib/mic/plugins/source/bootimg-efi.py
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2014-07-31 13:55:24 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-11 10:53:08 +0100
commit68e6adf2df70c3f83d67dc869b3ce989a6902b80 (patch)
treea650dc42d1ae3db2bd7cf3219a252306376d34e5 /scripts/lib/mic/plugins/source/bootimg-efi.py
parent963604605c0eff8c5b6ca6614b6c5fba8ae4dd15 (diff)
downloadpoky-68e6adf2df70c3f83d67dc869b3ce989a6902b80.tar.gz
wic: Make exec_cmd() error out instead of warn
The reason exec_cmd() warns but doesn't error out (broken parted) doesn't really make sense, since the parted invocations don't even use exec_cmd(). It really should just fail since by not doing so it's actually enabling invalid images in some cases. Also, since the return code is now always zero, there's no point in having a return code, so remove it. This represents a change in the API, so we also need to update all callers. (From OE-Core rev: a10bbd39eee29cc49d258bf08aaec279c3115c66) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/mic/plugins/source/bootimg-efi.py')
-rw-r--r--scripts/lib/mic/plugins/source/bootimg-efi.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/lib/mic/plugins/source/bootimg-efi.py b/scripts/lib/mic/plugins/source/bootimg-efi.py
index 0dd9152b59..aecda6b0f1 100644
--- a/scripts/lib/mic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/mic/plugins/source/bootimg-efi.py
@@ -53,7 +53,7 @@ class BootimgEFIPlugin(SourcePlugin):
53 exec_cmd(rm_cmd) 53 exec_cmd(rm_cmd)
54 54
55 install_cmd = "install -d %s/EFI/BOOT" % hdddir 55 install_cmd = "install -d %s/EFI/BOOT" % hdddir
56 tmp = exec_cmd(install_cmd) 56 exec_cmd(install_cmd)
57 57
58 splash = os.path.join(cr_workdir, "/EFI/boot/splash.jpg") 58 splash = os.path.join(cr_workdir, "/EFI/boot/splash.jpg")
59 if os.path.exists(splash): 59 if os.path.exists(splash):
@@ -116,7 +116,7 @@ class BootimgEFIPlugin(SourcePlugin):
116 116
117 install_cmd = "install -m 0644 %s/bzImage %s/bzImage" % \ 117 install_cmd = "install -m 0644 %s/bzImage %s/bzImage" % \
118 (staging_kernel_dir, hdddir) 118 (staging_kernel_dir, hdddir)
119 tmp = exec_cmd(install_cmd) 119 exec_cmd(install_cmd)
120 120
121 shutil.copyfile("%s/hdd/boot/EFI/BOOT/grub.cfg" % cr_workdir, 121 shutil.copyfile("%s/hdd/boot/EFI/BOOT/grub.cfg" % cr_workdir,
122 "%s/grub.cfg" % cr_workdir) 122 "%s/grub.cfg" % cr_workdir)
@@ -128,7 +128,7 @@ class BootimgEFIPlugin(SourcePlugin):
128 "%s/hdd/boot/EFI/BOOT/grub.cfg" % cr_workdir) 128 "%s/hdd/boot/EFI/BOOT/grub.cfg" % cr_workdir)
129 129
130 du_cmd = "du -bks %s" % hdddir 130 du_cmd = "du -bks %s" % hdddir
131 rc, out = exec_cmd(du_cmd) 131 out = exec_cmd(du_cmd)
132 blocks = int(out.split()[0]) 132 blocks = int(out.split()[0])
133 133
134 extra_blocks = part.get_extra_block_count(blocks) 134 extra_blocks = part.get_extra_block_count(blocks)
@@ -160,7 +160,7 @@ class BootimgEFIPlugin(SourcePlugin):
160 exec_cmd(chmod_cmd) 160 exec_cmd(chmod_cmd)
161 161
162 du_cmd = "du -Lbms %s" % bootimg 162 du_cmd = "du -Lbms %s" % bootimg
163 rc, out = exec_cmd(du_cmd) 163 out = exec_cmd(du_cmd)
164 bootimg_size = out.split()[0] 164 bootimg_size = out.split()[0]
165 165
166 part.set_size(bootimg_size) 166 part.set_size(bootimg_size)