summaryrefslogtreecommitdiffstats
path: root/scripts/wic
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-01-16 22:42:29 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-23 12:05:17 +0000
commit168f62e427a0e7f02d6ed1b20d6992cb049a097c (patch)
tree03b80332c64b1c6f75691567e3e351742ca0d4d3 /scripts/wic
parenta79b32c75af78c602d1822dc2d60f24b74fc549c (diff)
downloadpoky-168f62e427a0e7f02d6ed1b20d6992cb049a097c.tar.gz
wic: fix getting path of native sysroot
wic used STAGING_DIR_NATIVE variable as a path to native sysroot. This doesn't work with recipe specific sysroots as STAGING_DIR_NATIVE points to the native sysroot of the current recipe. Used RECIPE_SYSROOT_NATIVE variable of wic-tools recipe to fix the issue. (From OE-Core rev: de9d7d14cd03e4dfc5812890a53c79b706b56537) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/wic')
-rwxr-xr-xscripts/wic3
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/wic b/scripts/wic
index 1ad16665e7..f09dbc2e00 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -175,8 +175,7 @@ def wic_create_subcommand(args, usage_str):
175 175
176 rootfs_dir = get_bitbake_var("IMAGE_ROOTFS", options.image_name) 176 rootfs_dir = get_bitbake_var("IMAGE_ROOTFS", options.image_name)
177 kernel_dir = get_bitbake_var("DEPLOY_DIR_IMAGE", options.image_name) 177 kernel_dir = get_bitbake_var("DEPLOY_DIR_IMAGE", options.image_name)
178 native_sysroot = get_bitbake_var("STAGING_DIR_NATIVE", 178 native_sysroot = os.path.join(get_bitbake_var("RECIPE_SYSROOT_NATIVE", "wic-tools"))
179 options.image_name)
180 else: 179 else:
181 if options.build_rootfs: 180 if options.build_rootfs:
182 print("Image name is not specified, exiting. (Use -e/--image-name to specify it)\n") 181 print("Image name is not specified, exiting. (Use -e/--image-name to specify it)\n")