diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-01-31 19:31:55 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-02 17:37:44 +0000 |
commit | 653aaea3ccd4b671a6753bc9aecceb08f9eb0e41 (patch) | |
tree | 0eb9d944309e79eae732c76eb483533625aec22f /scripts/lib/wic/plugins/source/isoimage-isohybrid.py | |
parent | 1f7ce90af6e2e3ae23e11eae85d13f7c93b032cd (diff) | |
download | poky-653aaea3ccd4b671a6753bc9aecceb08f9eb0e41.tar.gz |
wic: code cleanup
Fixed indentation, unused imports, trailing lines etc.
[YOCTO #10619]
(From OE-Core rev: 5fa7768bfb4b6d464c6a812822b0665f52e7bea4)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/plugins/source/isoimage-isohybrid.py')
-rw-r--r-- | scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py index 6df375655c..56bb62d786 100644 --- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py +++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py | |||
@@ -100,10 +100,10 @@ class IsoImagePlugin(SourcePlugin): | |||
100 | grubefi_conf = get_custom_config(configfile) | 100 | grubefi_conf = get_custom_config(configfile) |
101 | if grubefi_conf: | 101 | if grubefi_conf: |
102 | msger.debug("Using custom configuration file " | 102 | msger.debug("Using custom configuration file " |
103 | "%s for grub.cfg" % configfile) | 103 | "%s for grub.cfg" % configfile) |
104 | else: | 104 | else: |
105 | msger.error("configfile is specified but failed to " | 105 | msger.error("configfile is specified but failed to " |
106 | "get it from %s." % configfile) | 106 | "get it from %s." % configfile) |
107 | else: | 107 | else: |
108 | splash = os.path.join(cr_workdir, "EFI/boot/splash.jpg") | 108 | splash = os.path.join(cr_workdir, "EFI/boot/splash.jpg") |
109 | if os.path.exists(splash): | 109 | if os.path.exists(splash): |
@@ -285,6 +285,7 @@ class IsoImagePlugin(SourcePlugin): | |||
285 | if not deploy_dir: | 285 | if not deploy_dir: |
286 | msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n") | 286 | msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n") |
287 | cp_cmd = "cp %s/%s %s" % (deploy_dir, initrd, cr_workdir) | 287 | cp_cmd = "cp %s/%s %s" % (deploy_dir, initrd, cr_workdir) |
288 | exec_cmd(cp_cmd) | ||
288 | else: | 289 | else: |
289 | # Prepare initial ramdisk | 290 | # Prepare initial ramdisk |
290 | initrd = "%s/initrd" % deploy_dir | 291 | initrd = "%s/initrd" % deploy_dir |
@@ -293,8 +294,7 @@ class IsoImagePlugin(SourcePlugin): | |||
293 | if not os.path.isfile(initrd): | 294 | if not os.path.isfile(initrd): |
294 | initrd = cls._build_initramfs_path(rootfs_dir, cr_workdir) | 295 | initrd = cls._build_initramfs_path(rootfs_dir, cr_workdir) |
295 | 296 | ||
296 | install_cmd = "install -m 0644 %s %s/initrd" \ | 297 | install_cmd = "install -m 0644 %s %s/initrd" % (initrd, isodir) |
297 | % (initrd, isodir) | ||
298 | exec_cmd(install_cmd) | 298 | exec_cmd(install_cmd) |
299 | 299 | ||
300 | # Remove the temporary file created by _build_initramfs_path function | 300 | # Remove the temporary file created by _build_initramfs_path function |
@@ -303,7 +303,7 @@ class IsoImagePlugin(SourcePlugin): | |||
303 | 303 | ||
304 | # Install bzImage | 304 | # Install bzImage |
305 | install_cmd = "install -m 0644 %s/bzImage %s/bzImage" % \ | 305 | install_cmd = "install -m 0644 %s/bzImage %s/bzImage" % \ |
306 | (kernel_dir, isodir) | 306 | (kernel_dir, isodir) |
307 | exec_cmd(install_cmd) | 307 | exec_cmd(install_cmd) |
308 | 308 | ||
309 | #Create bootloader for efi boot | 309 | #Create bootloader for efi boot |
@@ -362,7 +362,6 @@ class IsoImagePlugin(SourcePlugin): | |||
362 | exec_native_cmd(grub_cmd, native_sysroot) | 362 | exec_native_cmd(grub_cmd, native_sysroot) |
363 | 363 | ||
364 | else: | 364 | else: |
365 | # TODO: insert gummiboot stuff | ||
366 | msger.error("unrecognized bootimg-efi loader: %s" \ | 365 | msger.error("unrecognized bootimg-efi loader: %s" \ |
367 | % source_params['loader']) | 366 | % source_params['loader']) |
368 | except KeyError: | 367 | except KeyError: |