From afc486b6316f1118c8dcc74a5e217bb217dd1f85 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 22 Mar 2017 15:42:29 +0200 Subject: 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. Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- scripts/wic | 3 +-- 1 file changed, 1 insertion(+), 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): if options.build_check and not engine.verify_build_env(): raise WicError("Couldn't verify build environment, exiting") - bootimg_dir = "" - if options.debug: logger.setLevel(logging.DEBUG) @@ -189,6 +187,7 @@ def wic_create_subcommand(args, usage_str): rootfs_dir = get_bitbake_var("IMAGE_ROOTFS", options.image_name) kernel_dir = get_bitbake_var("DEPLOY_DIR_IMAGE", options.image_name) + bootimg_dir = get_bitbake_var("STAGING_DATADIR", options.image_name) native_sysroot = get_bitbake_var("RECIPE_SYSROOT_NATIVE", options.image_name) #, cache=False) else: -- cgit 1.2.3-korg