summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-06-22 15:15:22 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-27 22:42:49 +0100
commit597cba650c444ec7dd28386dc54aea7b49e2b918 (patch)
tree6774c7df188240decd99eee53a7fe9d16a12b0f2 /scripts/lib
parent40349f132583b5a1a4b2c3876f103616b7aee28d (diff)
downloadpoky-597cba650c444ec7dd28386dc54aea7b49e2b918.tar.gz
wic: Add new argument to direct plugin
Added 'compressor' argument to Direct plugin API to pass a name of compressor utility. (From OE-Core rev: 34c583274c2908351e3a84dd629302f1975f2f0d) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/image/engine.py1
-rw-r--r--scripts/lib/wic/imager/direct.py2
-rw-r--r--scripts/lib/wic/plugins/imager/direct_plugin.py4
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,
217 sys.exit(1) 217 sys.exit(1)
218 218
219 direct_args = list() 219 direct_args = list()
220 direct_args.insert(0, compressor or "")
220 direct_args.insert(0, oe_builddir) 221 direct_args.insert(0, oe_builddir)
221 direct_args.insert(0, image_output_dir) 222 direct_args.insert(0, image_output_dir)
222 direct_args.insert(0, wks_file) 223 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):
50 """ 50 """
51 51
52 def __init__(self, oe_builddir, image_output_dir, rootfs_dir, bootimg_dir, 52 def __init__(self, oe_builddir, image_output_dir, rootfs_dir, bootimg_dir,
53 kernel_dir, native_sysroot, creatoropts=None): 53 kernel_dir, native_sysroot, compressor, creatoropts=None):
54 """ 54 """
55 Initialize a DirectImageCreator instance. 55 Initialize a DirectImageCreator instance.
56 56
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):
62 """ 62 """
63 Create direct image, called from creator as 'direct' cmd 63 Create direct image, called from creator as 'direct' cmd
64 """ 64 """
65 if len(args) != 7: 65 if len(args) != 8:
66 raise errors.Usage("Extra arguments given") 66 raise errors.Usage("Extra arguments given")
67 67
68 native_sysroot = args[0] 68 native_sysroot = args[0]
@@ -75,6 +75,7 @@ class DirectPlugin(ImagerPlugin):
75 75
76 image_output_dir = args[5] 76 image_output_dir = args[5]
77 oe_builddir = args[6] 77 oe_builddir = args[6]
78 compressor = args[7]
78 79
79 krootfs_dir = cls.__rootfs_dir_to_dict(rootfs_dir) 80 krootfs_dir = cls.__rootfs_dir_to_dict(rootfs_dir)
80 81
@@ -86,6 +87,7 @@ class DirectPlugin(ImagerPlugin):
86 bootimg_dir, 87 bootimg_dir,
87 kernel_dir, 88 kernel_dir,
88 native_sysroot, 89 native_sysroot,
90 compressor,
89 creatoropts) 91 creatoropts)
90 92
91 try: 93 try: