summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/plugins/source
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-04-15 23:45:46 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-24 11:06:55 +0100
commit1d0c3387e8881a7a372ee38c0944540ce2ac8bc5 (patch)
treed81c0dd926c70c07cfaa46fd112409f720871971 /scripts/lib/wic/plugins/source
parenteb9964ecde42b098bca59deeb34012e09fec10ae (diff)
downloadpoky-1d0c3387e8881a7a372ee38c0944540ce2ac8bc5.tar.gz
wic: code cleanup: undefined variables
Fixed forgoten imports Wic_PartData and ImageError. Removed unused and undefined variable syslinux_conf. (From OE-Core rev: db0903ad89dcb655c0eec5ac6dce96aae26533da) 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')
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-efi.py3
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-pcbios.py1
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index d6c11ed428..883378ee84 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -27,6 +27,7 @@
27import os 27import os
28import shutil 28import shutil
29 29
30from wic.utils.errors import ImageError
30from wic import kickstart, msger 31from wic import kickstart, msger
31from wic.utils import misc, fs_related, errors, runner, cmdln 32from wic.utils import misc, fs_related, errors, runner, cmdln
32from wic.conf import configmgr 33from wic.conf import configmgr
@@ -72,8 +73,6 @@ class BootimgEFIPlugin(SourcePlugin):
72 grubefi_conf += "linux %s root=%s rootwait %s\n" \ 73 grubefi_conf += "linux %s root=%s rootwait %s\n" \
73 % (kernel, rootstr, options) 74 % (kernel, rootstr, options)
74 grubefi_conf += "}\n" 75 grubefi_conf += "}\n"
75 if splashline:
76 syslinux_conf += "%s\n" % splashline
77 76
78 msger.debug("Writing grubefi config %s/hdd/boot/EFI/BOOT/grub.cfg" \ 77 msger.debug("Writing grubefi config %s/hdd/boot/EFI/BOOT/grub.cfg" \
79 % cr_workdir) 78 % cr_workdir)
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index abb32ebc10..2280867308 100644
--- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
@@ -26,6 +26,7 @@
26 26
27import os 27import os
28 28
29from wic.utils.errors import ImageError
29from wic import kickstart, msger 30from wic import kickstart, msger
30from wic.utils import misc, fs_related, errors, runner, cmdln 31from wic.utils import misc, fs_related, errors, runner, cmdln
31from wic.conf import configmgr 32from wic.conf import configmgr