From f9f72c506befdff13260f37ded0beaea3aa30fad Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 8 Feb 2017 20:51:33 +0200 Subject: wic: remove unused argument scripts_path There is no need to pass scripts_path from main wic module down the stack as it's not used there. Removed scripts_path argument from DirectPlugin class and wic_create function. Signed-off-by: Ed Bartosh Signed-off-by: Ross Burton --- scripts/lib/wic/engine.py | 7 +++---- scripts/lib/wic/plugins/imager/direct.py | 2 +- scripts/wic | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'scripts') 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(): print(" %s" % plugin) -def wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir, native_sysroot, - scripts_path, options): +def wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir, + native_sysroot, options): """ Create image @@ -155,7 +155,6 @@ def wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir, native_sysroot, bootimg_dir - absolute path to the build's boot artifacts directory kernel_dir - absolute path to the build's kernel directory native_sysroot - absolute path to the build's native sysroots dir - scripts_path - absolute path to /scripts dir image_output_dir - dirname to create for image options - wic command line options (debug, bmap, etc) @@ -195,7 +194,7 @@ def wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir, native_sysroot, msger.error('Unknown plugin: %s' % pname) plugin = plugin_class(wks_file, rootfs_dir, bootimg_dir, kernel_dir, - native_sysroot, scripts_path, oe_builddir, options) + native_sysroot, oe_builddir, options) plugin.do_create() 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): name = 'direct' def __init__(self, wks_file, rootfs_dir, bootimg_dir, kernel_dir, - native_sysroot, scripts_path, oe_builddir, options): + native_sysroot, oe_builddir, options): try: self.ks = KickStart(wks_file) 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): print("Creating image(s)...\n") engine.wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir, - native_sysroot, scripts_path, options) + native_sysroot, options) def wic_list_subcommand(args, usage_str): -- cgit 1.2.3-korg