summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/plugins/source/bootimg-efi.py
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-01-31 19:31:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-02 17:37:44 +0000
commit653aaea3ccd4b671a6753bc9aecceb08f9eb0e41 (patch)
tree0eb9d944309e79eae732c76eb483533625aec22f /scripts/lib/wic/plugins/source/bootimg-efi.py
parent1f7ce90af6e2e3ae23e11eae85d13f7c93b032cd (diff)
downloadpoky-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/bootimg-efi.py')
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-efi.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 2b66a58d6e..dd6c920267 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -42,7 +42,7 @@ class BootimgEFIPlugin(SourcePlugin):
42 name = 'bootimg-efi' 42 name = 'bootimg-efi'
43 43
44 @classmethod 44 @classmethod
45 def do_configure_grubefi(cls, hdddir, creator, cr_workdir, source_params): 45 def do_configure_grubefi(cls, creator, cr_workdir):
46 """ 46 """
47 Create loader-specific (grub-efi) config 47 Create loader-specific (grub-efi) config
48 """ 48 """
@@ -54,10 +54,10 @@ class BootimgEFIPlugin(SourcePlugin):
54 # Use a custom configuration for grub 54 # Use a custom configuration for grub
55 grubefi_conf = custom_cfg 55 grubefi_conf = custom_cfg
56 msger.debug("Using custom configuration file " 56 msger.debug("Using custom configuration file "
57 "%s for grub.cfg" % configfile) 57 "%s for grub.cfg" % configfile)
58 else: 58 else:
59 msger.error("configfile is specified but failed to " 59 msger.error("configfile is specified but failed to "
60 "get it from %s." % configfile) 60 "get it from %s." % configfile)
61 61
62 if not custom_cfg: 62 if not custom_cfg:
63 # Create grub configuration using parameters from wks file 63 # Create grub configuration using parameters from wks file
@@ -125,10 +125,10 @@ class BootimgEFIPlugin(SourcePlugin):
125 # Use a custom configuration for systemd-boot 125 # Use a custom configuration for systemd-boot
126 boot_conf = custom_cfg 126 boot_conf = custom_cfg
127 msger.debug("Using custom configuration file " 127 msger.debug("Using custom configuration file "
128 "%s for systemd-boots's boot.conf" % configfile) 128 "%s for systemd-boots's boot.conf" % configfile)
129 else: 129 else:
130 msger.error("configfile is specified but failed to " 130 msger.error("configfile is specified but failed to "
131 "get it from %s." % configfile) 131 "get it from %s." % configfile)
132 132
133 if not custom_cfg: 133 if not custom_cfg:
134 # Create systemd-boot configuration using parameters from wks file 134 # Create systemd-boot configuration using parameters from wks file
@@ -164,7 +164,7 @@ class BootimgEFIPlugin(SourcePlugin):
164 164
165 try: 165 try:
166 if source_params['loader'] == 'grub-efi': 166 if source_params['loader'] == 'grub-efi':
167 cls.do_configure_grubefi(hdddir, creator, cr_workdir, source_params) 167 cls.do_configure_grubefi(creator, cr_workdir)
168 elif source_params['loader'] == 'systemd-boot': 168 elif source_params['loader'] == 'systemd-boot':
169 cls.do_configure_systemdboot(hdddir, creator, cr_workdir, source_params) 169 cls.do_configure_systemdboot(hdddir, creator, cr_workdir, source_params)
170 else: 170 else:
@@ -185,7 +185,7 @@ class BootimgEFIPlugin(SourcePlugin):
185 if not bootimg_dir: 185 if not bootimg_dir:
186 bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") 186 bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE")
187 if not bootimg_dir: 187 if not bootimg_dir:
188 msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n") 188 msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n")
189 # just so the result notes display it 189 # just so the result notes display it
190 creator.set_bootimg_dir(bootimg_dir) 190 creator.set_bootimg_dir(bootimg_dir)
191 191