summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDavis, Michael <michael.davis@essvote.com>2018-10-08 19:55:22 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-10 11:47:35 (GMT)
commit9fa7068855de7264b5953fe818bc0756183a2775 (patch)
tree1f705b861c6516efde97180be10f0dc5e20460d4 /scripts
parentf76e2655d476e9aa5ca9152bc802615bf54c5bdf (diff)
downloadpoky-9fa7068855de7264b5953fe818bc0756183a2775.tar.gz
wic: Support for changing the imager.
(From OE-Core rev: f24c3538a27388d282a94e2d8a70cd9108d0919c) Signed-off-by: Michael Davis <michael.davis@essvote.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/engine.py2
-rwxr-xr-xscripts/wic2
2 files changed, 3 insertions, 1 deletions
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index 850cec3..e6c830c 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -191,7 +191,7 @@ def wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir,
191 if not os.path.exists(options.outdir): 191 if not os.path.exists(options.outdir):
192 os.makedirs(options.outdir) 192 os.makedirs(options.outdir)
193 193
194 pname = 'direct' 194 pname = options.imager
195 plugin_class = PluginMgr.get_plugins('imager').get(pname) 195 plugin_class = PluginMgr.get_plugins('imager').get(pname)
196 if not plugin_class: 196 if not plugin_class:
197 raise WicError('Unknown plugin: %s' % pname) 197 raise WicError('Unknown plugin: %s' % pname)
diff --git a/scripts/wic b/scripts/wic
index 7392bc4..37dfe2d 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -362,6 +362,8 @@ def wic_init_parser_create(subparser):
362 "bitbake variables") 362 "bitbake variables")
363 subparser.add_argument("-D", "--debug", dest="debug", action="store_true", 363 subparser.add_argument("-D", "--debug", dest="debug", action="store_true",
364 default=False, help="output debug information") 364 default=False, help="output debug information")
365 subparser.add_argument("-i", "--imager", dest="imager",
366 default="direct", help="the wic imager plugin")
365 return 367 return
366 368
367 369