summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/engine.py4
-rw-r--r--scripts/lib/wic/imager/baseimager.py4
-rw-r--r--scripts/lib/wic/imager/direct.py2
-rw-r--r--scripts/lib/wic/plugin.py7
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-efi.py6
-rwxr-xr-xscripts/wic2
6 files changed, 6 insertions, 19 deletions
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index a034841a7a..30c4fa38dc 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -43,9 +43,7 @@ def verify_build_env():
43 43
44 Returns True if it is, false otherwise 44 Returns True if it is, false otherwise
45 """ 45 """
46 try: 46 if not os.environ.get("BUILDDIR"):
47 builddir = os.environ["BUILDDIR"]
48 except KeyError:
49 print "BUILDDIR not found, exiting. (Did you forget to source oe-init-build-env?)" 47 print "BUILDDIR not found, exiting. (Did you forget to source oe-init-build-env?)"
50 sys.exit(1) 48 sys.exit(1)
51 49
diff --git a/scripts/lib/wic/imager/baseimager.py b/scripts/lib/wic/imager/baseimager.py
index 67a2d0116b..4abcabca4b 100644
--- a/scripts/lib/wic/imager/baseimager.py
+++ b/scripts/lib/wic/imager/baseimager.py
@@ -132,9 +132,9 @@ class BaseImageCreator(object):
132 os.makedirs(self.workdir) 132 os.makedirs(self.workdir)
133 self.__builddir = tempfile.mkdtemp(dir=self.workdir, 133 self.__builddir = tempfile.mkdtemp(dir=self.workdir,
134 prefix="imgcreate-") 134 prefix="imgcreate-")
135 except OSError, (err, msg): 135 except OSError as err:
136 raise CreatorError("Failed create build directory in %s: %s" % 136 raise CreatorError("Failed create build directory in %s: %s" %
137 (self.tmpdir, msg)) 137 (self.tmpdir, err))
138 138
139 def __setup_tmpdir(self): 139 def __setup_tmpdir(self):
140 if not self.enabletmpfs: 140 if not self.enabletmpfs:
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
index d68fd2a8c5..74ebbe79b6 100644
--- a/scripts/lib/wic/imager/direct.py
+++ b/scripts/lib/wic/imager/direct.py
@@ -327,7 +327,7 @@ class DirectImageCreator(BaseImageCreator):
327 327
328 parts = self._get_parts() 328 parts = self._get_parts()
329 329
330 for disk_name, disk in self.__image.disks.items(): 330 for disk_name in self.__image.disks:
331 extension = "direct" + {"gzip": ".gz", 331 extension = "direct" + {"gzip": ".gz",
332 "bzip2": ".bz2", 332 "bzip2": ".bz2",
333 "xz": ".xz", 333 "xz": ".xz",
diff --git a/scripts/lib/wic/plugin.py b/scripts/lib/wic/plugin.py
index e901f807ad..7244989d86 100644
--- a/scripts/lib/wic/plugin.py
+++ b/scripts/lib/wic/plugin.py
@@ -124,12 +124,7 @@ class PluginMgr(object):
124 124
125 self.append_dirs(plugins_dir) 125 self.append_dirs(plugins_dir)
126 126
127 plugins = [] 127 return self.get_plugins('source')
128
129 for _source_name, klass in self.get_plugins('source').iteritems():
130 plugins.append(_source_name)
131
132 return plugins
133 128
134 129
135 def get_source_plugin_methods(self, source_name, methods): 130 def get_source_plugin_methods(self, source_name, methods):
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 49d5c8ae82..b48cc835d6 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -45,12 +45,6 @@ class BootimgEFIPlugin(SourcePlugin):
45 """ 45 """
46 Create loader-specific (grub-efi) config 46 Create loader-specific (grub-efi) config
47 """ 47 """
48 splash = os.path.join(cr_workdir, "/EFI/boot/splash.jpg")
49 if os.path.exists(splash):
50 splashline = "menu background splash.jpg"
51 else:
52 splashline = ""
53
54 options = cr.ks.handler.bootloader.appendLine 48 options = cr.ks.handler.bootloader.appendLine
55 49
56 grubefi_conf = "" 50 grubefi_conf = ""
diff --git a/scripts/wic b/scripts/wic
index 94028e2b08..c99c5042bd 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -308,7 +308,7 @@ def main(argv):
308 308
309 parser.disable_interspersed_args() 309 parser.disable_interspersed_args()
310 310
311 (options, args) = parser.parse_args(argv) 311 args = parser.parse_args(argv)[1]
312 312
313 if len(args): 313 if len(args):
314 if args[0] == "help": 314 if args[0] == "help":