* [wic][PATCH] wic: code cleanup: undefined variables
@ 2015-04-15 20:45 Ed Bartosh
0 siblings, 0 replies; only message in thread
From: Ed Bartosh @ 2015-04-15 20:45 UTC (permalink / raw
To: openembedded-core
Fixed forgoten imports Wic_PartData and ImageError.
Removed unused and undefined variable syslinux_conf.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
scripts/lib/wic/kickstart/custom_commands/__init__.py | 1 +
scripts/lib/wic/plugins/source/bootimg-efi.py | 3 +--
scripts/lib/wic/plugins/source/bootimg-pcbios.py | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/scripts/lib/wic/kickstart/custom_commands/__init__.py b/scripts/lib/wic/kickstart/custom_commands/__init__.py
index f84c6d9..b4e613d 100644
--- a/scripts/lib/wic/kickstart/custom_commands/__init__.py
+++ b/scripts/lib/wic/kickstart/custom_commands/__init__.py
@@ -1,6 +1,7 @@
from micpartition import Mic_Partition
from micpartition import Mic_PartData
from partition import Wic_Partition
+from partition import Wic_PartData
__all__ = (
"Mic_Partition",
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index d6c11ed..883378e 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -27,6 +27,7 @@
import os
import shutil
+from wic.utils.errors import ImageError
from wic import kickstart, msger
from wic.utils import misc, fs_related, errors, runner, cmdln
from wic.conf import configmgr
@@ -72,8 +73,6 @@ class BootimgEFIPlugin(SourcePlugin):
grubefi_conf += "linux %s root=%s rootwait %s\n" \
% (kernel, rootstr, options)
grubefi_conf += "}\n"
- if splashline:
- syslinux_conf += "%s\n" % splashline
msger.debug("Writing grubefi config %s/hdd/boot/EFI/BOOT/grub.cfg" \
% cr_workdir)
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index abb32eb..2280867 100644
--- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
@@ -26,6 +26,7 @@
import os
+from wic.utils.errors import ImageError
from wic import kickstart, msger
from wic.utils import misc, fs_related, errors, runner, cmdln
from wic.conf import configmgr
--
2.1.4
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2015-04-15 20:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-15 20:45 [wic][PATCH] wic: code cleanup: undefined variables Ed Bartosh
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.