diff options
Diffstat (limited to 'scripts/lib/mic/plugins/source')
-rw-r--r-- | scripts/lib/mic/plugins/source/bootimg-efi.py | 8 | ||||
-rw-r--r-- | scripts/lib/mic/plugins/source/bootimg-pcbios.py | 10 |
2 files changed, 9 insertions, 9 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) |
diff --git a/scripts/lib/mic/plugins/source/bootimg-pcbios.py b/scripts/lib/mic/plugins/source/bootimg-pcbios.py index 1211e5c93b..6488ae9729 100644 --- a/scripts/lib/mic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/mic/plugins/source/bootimg-pcbios.py | |||
@@ -78,7 +78,7 @@ class BootimgPcbiosPlugin(SourcePlugin): | |||
78 | exec_cmd(rm_cmd) | 78 | exec_cmd(rm_cmd) |
79 | 79 | ||
80 | install_cmd = "install -d %s" % hdddir | 80 | install_cmd = "install -d %s" % hdddir |
81 | tmp = exec_cmd(install_cmd) | 81 | exec_cmd(install_cmd) |
82 | 82 | ||
83 | splash = os.path.join(cr_workdir, "/hdd/boot/splash.jpg") | 83 | splash = os.path.join(cr_workdir, "/hdd/boot/splash.jpg") |
84 | if os.path.exists(splash): | 84 | if os.path.exists(splash): |
@@ -144,14 +144,14 @@ class BootimgPcbiosPlugin(SourcePlugin): | |||
144 | 144 | ||
145 | install_cmd = "install -m 0644 %s/bzImage %s/vmlinuz" \ | 145 | install_cmd = "install -m 0644 %s/bzImage %s/vmlinuz" \ |
146 | % (staging_kernel_dir, hdddir) | 146 | % (staging_kernel_dir, hdddir) |
147 | tmp = exec_cmd(install_cmd) | 147 | exec_cmd(install_cmd) |
148 | 148 | ||
149 | install_cmd = "install -m 444 %s/syslinux/ldlinux.sys %s/ldlinux.sys" \ | 149 | install_cmd = "install -m 444 %s/syslinux/ldlinux.sys %s/ldlinux.sys" \ |
150 | % (staging_data_dir, hdddir) | 150 | % (staging_data_dir, hdddir) |
151 | tmp = exec_cmd(install_cmd) | 151 | exec_cmd(install_cmd) |
152 | 152 | ||
153 | du_cmd = "du -bks %s" % hdddir | 153 | du_cmd = "du -bks %s" % hdddir |
154 | rc, out = exec_cmd(du_cmd) | 154 | out = exec_cmd(du_cmd) |
155 | blocks = int(out.split()[0]) | 155 | blocks = int(out.split()[0]) |
156 | 156 | ||
157 | extra_blocks = part.get_extra_block_count(blocks) | 157 | extra_blocks = part.get_extra_block_count(blocks) |
@@ -186,7 +186,7 @@ class BootimgPcbiosPlugin(SourcePlugin): | |||
186 | exec_cmd(chmod_cmd) | 186 | exec_cmd(chmod_cmd) |
187 | 187 | ||
188 | du_cmd = "du -Lbms %s" % bootimg | 188 | du_cmd = "du -Lbms %s" % bootimg |
189 | rc, out = exec_cmd(du_cmd) | 189 | out = exec_cmd(du_cmd) |
190 | bootimg_size = out.split()[0] | 190 | bootimg_size = out.split()[0] |
191 | 191 | ||
192 | part.set_size(bootimg_size) | 192 | part.set_size(bootimg_size) |