summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scripts/lib/wic/engine.py7
-rw-r--r--scripts/lib/wic/plugins/imager/direct.py2
-rwxr-xr-xscripts/wic2
3 files changed, 5 insertions, 6 deletions
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index e27598d01a..1aa8f6534e 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -145,8 +145,8 @@ def list_source_plugins():
145 print(" %s" % plugin) 145 print(" %s" % plugin)
146 146
147 147
148def wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir, native_sysroot, 148def wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir,
149 scripts_path, options): 149 native_sysroot, options):
150 """ 150 """
151 Create image 151 Create image
152 152
@@ -155,7 +155,6 @@ def wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir, native_sysroot,
155 bootimg_dir - absolute path to the build's boot artifacts directory 155 bootimg_dir - absolute path to the build's boot artifacts directory
156 kernel_dir - absolute path to the build's kernel directory 156 kernel_dir - absolute path to the build's kernel directory
157 native_sysroot - absolute path to the build's native sysroots dir 157 native_sysroot - absolute path to the build's native sysroots dir
158 scripts_path - absolute path to /scripts dir
159 image_output_dir - dirname to create for image 158 image_output_dir - dirname to create for image
160 options - wic command line options (debug, bmap, etc) 159 options - wic command line options (debug, bmap, etc)
161 160
@@ -195,7 +194,7 @@ def wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir, native_sysroot,
195 msger.error('Unknown plugin: %s' % pname) 194 msger.error('Unknown plugin: %s' % pname)
196 195
197 plugin = plugin_class(wks_file, rootfs_dir, bootimg_dir, kernel_dir, 196 plugin = plugin_class(wks_file, rootfs_dir, bootimg_dir, kernel_dir,
198 native_sysroot, scripts_path, oe_builddir, options) 197 native_sysroot, oe_builddir, options)
199 198
200 plugin.do_create() 199 plugin.do_create()
201 200
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index c399d476da..a9144e2f4b 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -68,7 +68,7 @@ class DirectPlugin(ImagerPlugin):
68 name = 'direct' 68 name = 'direct'
69 69
70 def __init__(self, wks_file, rootfs_dir, bootimg_dir, kernel_dir, 70 def __init__(self, wks_file, rootfs_dir, bootimg_dir, kernel_dir,
71 native_sysroot, scripts_path, oe_builddir, options): 71 native_sysroot, oe_builddir, options):
72 try: 72 try:
73 self.ks = KickStart(wks_file) 73 self.ks = KickStart(wks_file)
74 except KickStartError as err: 74 except KickStartError as err:
diff --git a/scripts/wic b/scripts/wic
index 8a959a01af..1b7d7dfa4e 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -250,7 +250,7 @@ def wic_create_subcommand(args, usage_str):
250 250
251 print("Creating image(s)...\n") 251 print("Creating image(s)...\n")
252 engine.wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir, 252 engine.wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir,
253 native_sysroot, scripts_path, options) 253 native_sysroot, options)
254 254
255 255
256def wic_list_subcommand(args, usage_str): 256def wic_list_subcommand(args, usage_str):