[oe-commits] Ed Bartosh : wic: Add new argument to direct plugin
git at git.openembedded.org
git at git.openembedded.org
Fri Jun 26 13:08:59 UTC 2015
Module: openembedded-core.git
Branch: master-next
Commit: 34c583274c2908351e3a84dd629302f1975f2f0d
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=34c583274c2908351e3a84dd629302f1975f2f0d
Author: Ed Bartosh <ed.bartosh at linux.intel.com>
Date: Mon Jun 22 15:15:22 2015 +0300
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 at linux.intel.com>
---
scripts/lib/image/engine.py | 1 +
scripts/lib/wic/imager/direct.py | 2 +-
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 047c40d..d5c34b4 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 2290ecd..f3f20e0 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 07811bd..db01c41 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:
More information about the Openembedded-commits
mailing list