summaryrefslogtreecommitdiffstats
path: root/scripts/wic
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-08-30 20:47:05 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-30 21:38:23 +0100
commit530f3c52a49b23fdec037e3cd21764ee36e46810 (patch)
tree1598f2eb6446e75af713c7466ad115ff2892f52e /scripts/wic
parent5856f8ff968a7c7688c340881d56cfb2bf3869e3 (diff)
downloadpoky-530f3c52a49b23fdec037e3cd21764ee36e46810.tar.gz
wic: implement --vars option
This option is used to point wic to the directory with .env files containing list of bitbake variables and their values. If this option is used wic will get bitbake variables from files instead of parsing 'bitbake -e' output. The main reason for this is to support new mode, when bitbake runs wic to produce wic images. In this case wic can't run bitbake again as it's locked, so it will get variables from .env files. (From OE-Core rev: abdfad1cd68fcd7387c2a508ab81512e8f6b93ce) 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/wic6
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/wic b/scripts/wic
index 5818e2da2e..25b0d676fd 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -114,6 +114,9 @@ def wic_create_subcommand(args, usage_str):
114 parser.add_option("-c", "--compress-with", choices=("gzip", "bzip2", "xz"), 114 parser.add_option("-c", "--compress-with", choices=("gzip", "bzip2", "xz"),
115 dest='compressor', 115 dest='compressor',
116 help="compress image with specified compressor") 116 help="compress image with specified compressor")
117 parser.add_option("-v", "--vars", dest='vars_dir',
118 help="directory with <image>.env files that store "
119 "bitbake variables")
117 parser.add_option("-D", "--debug", dest="debug", action="store_true", 120 parser.add_option("-D", "--debug", dest="debug", action="store_true",
118 default=False, help="output debug information") 121 default=False, help="output debug information")
119 122
@@ -146,6 +149,9 @@ def wic_create_subcommand(args, usage_str):
146 else: 149 else:
147 options.build_check = False 150 options.build_check = False
148 151
152 if options.vars_dir:
153 BB_VARS.vars_dir = options.vars_dir
154
149 if options.build_check: 155 if options.build_check:
150 print "Checking basic build environment..." 156 print "Checking basic build environment..."
151 if not engine.verify_build_env(): 157 if not engine.verify_build_env():