summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-03-22 15:42:29 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-23 13:19:49 +0000
commit3ea735d390799012b16505f845c5d7e2d14d4a9b (patch)
tree44cb22aa12c108dcb937a1dfb96873250c151bd8 /scripts
parentb78c564cca7353ac86a432b03469dad190b46fa3 (diff)
downloadpoky-3ea735d390799012b16505f845c5d7e2d14d4a9b.tar.gz
wic: use STAGING_DATADIR as a default for bootimg_dir
Default value for bootimg_dir was not set in main wic script unlike the rest of artifacts: kernel_dir, roofts_dir and native_sysroot. Set it to the value of STAGING_DATADIR for consistency and to avoid confusion of wic plugin developers. (From OE-Core rev: afc486b6316f1118c8dcc74a5e217bb217dd1f85) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/wic3
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/wic b/scripts/wic
index 99721dcc33..8e9c05c18c 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -171,8 +171,6 @@ def wic_create_subcommand(args, usage_str):
171 if options.build_check and not engine.verify_build_env(): 171 if options.build_check and not engine.verify_build_env():
172 raise WicError("Couldn't verify build environment, exiting") 172 raise WicError("Couldn't verify build environment, exiting")
173 173
174 bootimg_dir = ""
175
176 if options.debug: 174 if options.debug:
177 logger.setLevel(logging.DEBUG) 175 logger.setLevel(logging.DEBUG)
178 176
@@ -189,6 +187,7 @@ def wic_create_subcommand(args, usage_str):
189 187
190 rootfs_dir = get_bitbake_var("IMAGE_ROOTFS", options.image_name) 188 rootfs_dir = get_bitbake_var("IMAGE_ROOTFS", options.image_name)
191 kernel_dir = get_bitbake_var("DEPLOY_DIR_IMAGE", options.image_name) 189 kernel_dir = get_bitbake_var("DEPLOY_DIR_IMAGE", options.image_name)
190 bootimg_dir = get_bitbake_var("STAGING_DATADIR", options.image_name)
192 native_sysroot = get_bitbake_var("RECIPE_SYSROOT_NATIVE", 191 native_sysroot = get_bitbake_var("RECIPE_SYSROOT_NATIVE",
193 options.image_name) #, cache=False) 192 options.image_name) #, cache=False)
194 else: 193 else: