diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-06-22 14:58:19 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-27 22:42:49 +0100 |
commit | 40349f132583b5a1a4b2c3876f103616b7aee28d (patch) | |
tree | a8cf43bd41f182136382cfd893ddf08711e43902 /scripts | |
parent | 13427e1598a73e26fdd7af7f550f76b5d3a03777 (diff) | |
download | poky-40349f132583b5a1a4b2c3876f103616b7aee28d.tar.gz |
wic: Add new argument to wic_create function
Added 'compressor' argument to wic_create to pass a name of
compressor utility to the wic engine.
(From OE-Core rev: 33d38aefb06f8849b46c5f9f6c1db73b4dccd985)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/lib/image/engine.py | 4 | ||||
-rwxr-xr-x | scripts/wic | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py index 29099ee0e6..047c40d908 100644 --- a/scripts/lib/image/engine.py +++ b/scripts/lib/image/engine.py | |||
@@ -179,7 +179,8 @@ def list_source_plugins(): | |||
179 | 179 | ||
180 | 180 | ||
181 | def wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir, | 181 | def wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir, |
182 | native_sysroot, scripts_path, image_output_dir, debug): | 182 | native_sysroot, scripts_path, image_output_dir, |
183 | compressor, debug): | ||
183 | """Create image | 184 | """Create image |
184 | 185 | ||
185 | wks_file - user-defined OE kickstart file | 186 | wks_file - user-defined OE kickstart file |
@@ -189,6 +190,7 @@ def wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir, | |||
189 | native_sysroot - absolute path to the build's native sysroots dir | 190 | native_sysroot - absolute path to the build's native sysroots dir |
190 | scripts_path - absolute path to /scripts dir | 191 | scripts_path - absolute path to /scripts dir |
191 | image_output_dir - dirname to create for image | 192 | image_output_dir - dirname to create for image |
193 | compressor - compressor utility to compress the image | ||
192 | 194 | ||
193 | Normally, the values for the build artifacts values are determined | 195 | Normally, the values for the build artifacts values are determined |
194 | by 'wic -e' from the output of the 'bitbake -e' command given an | 196 | by 'wic -e' from the output of the 'bitbake -e' command given an |
diff --git a/scripts/wic b/scripts/wic index 8869fba048..f9be972bad 100755 --- a/scripts/wic +++ b/scripts/wic | |||
@@ -228,7 +228,7 @@ def wic_create_subcommand(args, usage_str): | |||
228 | print "Creating image(s)...\n" | 228 | print "Creating image(s)...\n" |
229 | engine.wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir, | 229 | engine.wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir, |
230 | native_sysroot, scripts_path, image_output_dir, | 230 | native_sysroot, scripts_path, image_output_dir, |
231 | options.debug) | 231 | options.compressor, options.debug) |
232 | 232 | ||
233 | 233 | ||
234 | def wic_list_subcommand(args, usage_str): | 234 | def wic_list_subcommand(args, usage_str): |