summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-02-02 15:32:59 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-02 17:37:45 +0000
commit3571e3e77f12f01683ff613cf8bc4af1180b075e (patch)
tree6ceaa0bcd55319220bdd44f00f77a15baa5fbed3 /scripts
parent14652a42d81adf0340b580342a316a37996b0d37 (diff)
downloadpoky-3571e3e77f12f01683ff613cf8bc4af1180b075e.tar.gz
wic: get rid of image_output_dir variable
Used options.outdir instead of image_output_dir. There is no sense to use extra variable for this. (From OE-Core rev: c6013dcb158a84d48cc2677f1509681cf9e0a3cb) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/wic6
1 files changed, 1 insertions, 5 deletions
diff --git a/scripts/wic b/scripts/wic
index 33355eed07..17e82315e2 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -203,10 +203,6 @@ def wic_create_subcommand(args, usage_str):
203 "kickstart (.wks) filename)\n" % args[0]) 203 "kickstart (.wks) filename)\n" % args[0])
204 sys.exit(1) 204 sys.exit(1)
205 205
206 image_output_dir = ""
207 if options.outdir:
208 image_output_dir = options.outdir
209
210 if not options.image_name: 206 if not options.image_name:
211 rootfs_dir = '' 207 rootfs_dir = ''
212 if 'ROOTFS_DIR' in options.rootfs_dir: 208 if 'ROOTFS_DIR' in options.rootfs_dir:
@@ -254,7 +250,7 @@ def wic_create_subcommand(args, usage_str):
254 250
255 print("Creating image(s)...\n") 251 print("Creating image(s)...\n")
256 engine.wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir, 252 engine.wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir,
257 native_sysroot, scripts_path, image_output_dir, 253 native_sysroot, scripts_path, options.outdir,
258 options.compressor, options.bmap, options.debug) 254 options.compressor, options.bmap, options.debug)
259 255
260 256