summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavis, Michael <michael.davis@essvote.com>2018-10-08 19:55:22 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-25 15:01:21 +0100
commitd335a43030b08e6b6191fba2cebfc9e1af4a862f (patch)
treee6484e5b09d3310078011486dc853c371bc3f5a6
parent56ddd6b3f454da60ccbc0e138171763032c644f2 (diff)
downloadpoky-d335a43030b08e6b6191fba2cebfc9e1af4a862f.tar.gz
wic: Support for changing the imager.
(From OE-Core rev: 30b33d787595b8c3120b73c755a432a0f0f30fa7) 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> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 f0c5ff0aaf..4996bfffe7 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 7392bc4e7f..37dfe2dc58 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