diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-06-22 15:15:22 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-26 14:08:01 +0100 |
| commit | 34c583274c2908351e3a84dd629302f1975f2f0d (patch) | |
| tree | ecad790d22619b0b15dba00a72b091e7df2f89e3 /scripts | |
| parent | 33d38aefb06f8849b46c5f9f6c1db73b4dccd985 (diff) | |
| download | openembedded-core-contrib-34c583274c2908351e3a84dd629302f1975f2f0d.tar.gz | |
wic: Add new argument to direct plugin
Added 'compressor' argument to Direct plugin API to
pass a name of compressor utility.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/image/engine.py | 1 | ||||
| -rw-r--r-- | scripts/lib/wic/imager/direct.py | 2 | ||||
| -rw-r--r-- | scripts/lib/wic/plugins/imager/direct_plugin.py | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py index 047c40d908..d5c34b4611 100644 --- a/scripts/lib/image/engine.py +++ b/scripts/lib/image/engine.py @@ -217,6 +217,7 @@ def wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir, sys.exit(1) direct_args = list() + direct_args.insert(0, compressor or "") direct_args.insert(0, oe_builddir) direct_args.insert(0, image_output_dir) direct_args.insert(0, wks_file) diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py index 2290ecd07d..f3f20e0745 100644 --- a/scripts/lib/wic/imager/direct.py +++ b/scripts/lib/wic/imager/direct.py @@ -50,7 +50,7 @@ class DirectImageCreator(BaseImageCreator): """ def __init__(self, oe_builddir, image_output_dir, rootfs_dir, bootimg_dir, - kernel_dir, native_sysroot, creatoropts=None): + kernel_dir, native_sysroot, compressor, creatoropts=None): """ Initialize a DirectImageCreator instance. diff --git a/scripts/lib/wic/plugins/imager/direct_plugin.py b/scripts/lib/wic/plugins/imager/direct_plugin.py index 07811bd26d..db01c411ba 100644 --- a/scripts/lib/wic/plugins/imager/direct_plugin.py +++ b/scripts/lib/wic/plugins/imager/direct_plugin.py @@ -62,7 +62,7 @@ class DirectPlugin(ImagerPlugin): """ Create direct image, called from creator as 'direct' cmd """ - if len(args) != 7: + if len(args) != 8: raise errors.Usage("Extra arguments given") native_sysroot = args[0] @@ -75,6 +75,7 @@ class DirectPlugin(ImagerPlugin): image_output_dir = args[5] oe_builddir = args[6] + compressor = args[7] krootfs_dir = cls.__rootfs_dir_to_dict(rootfs_dir) @@ -86,6 +87,7 @@ class DirectPlugin(ImagerPlugin): bootimg_dir, kernel_dir, native_sysroot, + compressor, creatoropts) try: |