summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Pittman <bill.pittman@ni.com>2022-02-15 16:54:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-03-22 22:18:51 +0000
commit1adce7ef9630212639d09e62f68eba016d59666d (patch)
tree310f8bcab7c66e6ce2f46a5c7fdabfbd08f4fea9
parentd5424469d73196a7ead182dd79b6623a3086fa75 (diff)
downloadpoky-1adce7ef9630212639d09e62f68eba016d59666d.tar.gz
wic: Use custom kernel path if provided
If the custom kernel path is provided in options, then use that path instead of the default path. (From OE-Core rev: bcef80623f015c006778edee5cf40dad063e51db) Signed-off-by: Bill Pittman <bill.pittman@ni.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 1068102216a894c467f71f6046fdb37d5577545c) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/wic3
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/wic b/scripts/wic
index 6547abe0e9..c0bc0e6fe8 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -159,6 +159,9 @@ def wic_create_subcommand(options, usage_str):
159 "(Use -e/--image-name to specify it)") 159 "(Use -e/--image-name to specify it)")
160 native_sysroot = options.native_sysroot 160 native_sysroot = options.native_sysroot
161 161
162 if options.kernel_dir:
163 kernel_dir = options.kernel_dir
164
162 if not options.vars_dir and (not native_sysroot or not os.path.isdir(native_sysroot)): 165 if not options.vars_dir and (not native_sysroot or not os.path.isdir(native_sysroot)):
163 logger.info("Building wic-tools...\n") 166 logger.info("Building wic-tools...\n")
164 subprocess.check_call(["bitbake", "wic-tools"]) 167 subprocess.check_call(["bitbake", "wic-tools"])