summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-01-19 16:01:34 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-23 12:05:18 +0000
commite0193182c589e12f8a13c4f2ff44c9abe5451cd7 (patch)
tree45a34879e60f13808eba0d843401c3de4e575be8
parent7d5f44b455ec7f6d697454ab4bf64f367463bf0e (diff)
downloadpoky-e0193182c589e12f8a13c4f2ff44c9abe5451cd7.tar.gz
wic: rebuild wic-tools if its sysroot doesn't exist
Rebuild wic-tools if its native sysroot doesn't exist to ensure that all required tools are available. (From OE-Core rev: 0d005d099a2b8ee1303b98710cdc78e06e14ab39) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/wic14
1 files changed, 13 insertions, 1 deletions
diff --git a/scripts/wic b/scripts/wic
index f09dbc2e00..8918cb4853 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -175,11 +175,23 @@ 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 = os.path.join(get_bitbake_var("RECIPE_SYSROOT_NATIVE", "wic-tools")) 178 native_sysroot = get_bitbake_var("RECIPE_SYSROOT_NATIVE",
179 "wic-tools", cache=False)
179 else: 180 else:
180 if options.build_rootfs: 181 if options.build_rootfs:
181 print("Image name is not specified, exiting. (Use -e/--image-name to specify it)\n") 182 print("Image name is not specified, exiting. (Use -e/--image-name to specify it)\n")
182 sys.exit(1) 183 sys.exit(1)
184 native_sysroot = options.native_sysroot
185
186 if not native_sysroot or not os.path.isdir(native_sysroot):
187 print("Building wic-tools...\n")
188 if bitbake_main(BitBakeConfigParameters("bitbake wic-tools".split()),
189 cookerdata.CookerConfiguration()):
190 sys.exit(1)
191 native_sysroot = get_bitbake_var("RECIPE_SYSROOT_NATIVE", "wic-tools")
192 if not native_sysroot:
193 print("Unable to find the location of the native tools sysroot to use\n")
194 sys.exit(1)
183 195
184 wks_file = args[0] 196 wks_file = args[0]
185 197