diff options
Diffstat (limited to 'scripts/wic')
-rwxr-xr-x | scripts/wic | 40 |
1 files changed, 37 insertions, 3 deletions
diff --git a/scripts/wic b/scripts/wic index 824acaebd3..442334030f 100755 --- a/scripts/wic +++ b/scripts/wic | |||
@@ -45,6 +45,30 @@ sys.path = sys.path + [lib_path] | |||
45 | from image.help import * | 45 | from image.help import * |
46 | from image.engine import * | 46 | from image.engine import * |
47 | 47 | ||
48 | def rootfs_dir_to_args(krootfs_dir): | ||
49 | """ | ||
50 | Get a rootfs_dir dict and serialize to string | ||
51 | """ | ||
52 | rootfs_dir = '' | ||
53 | for k, v in krootfs_dir.items(): | ||
54 | rootfs_dir += ' ' | ||
55 | rootfs_dir += '='.join([k, v]) | ||
56 | return rootfs_dir.strip() | ||
57 | |||
58 | def callback_rootfs_dir(option, opt, value, parser): | ||
59 | """ | ||
60 | Build a dict using --rootfs_dir connection=dir | ||
61 | """ | ||
62 | if not type(parser.values.rootfs_dir) is dict: | ||
63 | parser.values.rootfs_dir = dict() | ||
64 | |||
65 | if '=' in value: | ||
66 | (key, rootfs_dir) = value.split('=') | ||
67 | else: | ||
68 | key = 'ROOTFS_DIR' | ||
69 | rootfs_dir = value | ||
70 | |||
71 | parser.values.rootfs_dir[key] = rootfs_dir | ||
48 | 72 | ||
49 | def wic_create_subcommand(args, usage_str): | 73 | def wic_create_subcommand(args, usage_str): |
50 | """ | 74 | """ |
@@ -60,7 +84,8 @@ def wic_create_subcommand(args, usage_str): | |||
60 | parser.add_option("-e", "--image-name", dest = "image_name", | 84 | parser.add_option("-e", "--image-name", dest = "image_name", |
61 | action = "store", help = "name of the image to use the artifacts from e.g. core-image-sato") | 85 | action = "store", help = "name of the image to use the artifacts from e.g. core-image-sato") |
62 | parser.add_option("-r", "--rootfs-dir", dest = "rootfs_dir", | 86 | parser.add_option("-r", "--rootfs-dir", dest = "rootfs_dir", |
63 | action = "store", help = "path to the /rootfs dir to use as the .wks rootfs source") | 87 | action = "callback", callback = callback_rootfs_dir, type = "string", |
88 | help = "path to the /rootfs dir to use as the .wks rootfs source") | ||
64 | parser.add_option("-b", "--bootimg-dir", dest = "bootimg_dir", | 89 | parser.add_option("-b", "--bootimg-dir", dest = "bootimg_dir", |
65 | action = "store", help = "path to the dir containing the boot artifacts (e.g. /EFI or /syslinux dirs) to use as the .wks bootimg source") | 90 | action = "store", help = "path to the dir containing the boot artifacts (e.g. /EFI or /syslinux dirs) to use as the .wks bootimg source") |
66 | parser.add_option("-k", "--kernel-dir", dest = "kernel_dir", | 91 | parser.add_option("-k", "--kernel-dir", dest = "kernel_dir", |
@@ -125,11 +150,13 @@ def wic_create_subcommand(args, usage_str): | |||
125 | image_output_dir = options.outdir | 150 | image_output_dir = options.outdir |
126 | 151 | ||
127 | if not options.image_name: | 152 | if not options.image_name: |
128 | rootfs_dir = options.rootfs_dir | 153 | rootfs_dir = '' |
154 | if 'ROOTFS_DIR' in options.rootfs_dir: | ||
155 | rootfs_dir = options.rootfs_dir['ROOTFS_DIR'] | ||
129 | bootimg_dir = options.bootimg_dir | 156 | bootimg_dir = options.bootimg_dir |
130 | kernel_dir = options.kernel_dir | 157 | kernel_dir = options.kernel_dir |
131 | native_sysroot = options.native_sysroot | 158 | native_sysroot = options.native_sysroot |
132 | if not os.path.isdir(rootfs_dir): | 159 | if rootfs_dir and not os.path.isdir(rootfs_dir): |
133 | print "--roofs-dir (-r) not found, exiting\n" | 160 | print "--roofs-dir (-r) not found, exiting\n" |
134 | sys.exit(1) | 161 | sys.exit(1) |
135 | if not os.path.isdir(bootimg_dir): | 162 | if not os.path.isdir(bootimg_dir): |
@@ -162,6 +189,13 @@ def wic_create_subcommand(args, usage_str): | |||
162 | (not_found, not_found_dir) | 189 | (not_found, not_found_dir) |
163 | sys.exit(1) | 190 | sys.exit(1) |
164 | 191 | ||
192 | krootfs_dir = options.rootfs_dir | ||
193 | if krootfs_dir is None: | ||
194 | krootfs_dir = {} | ||
195 | krootfs_dir['ROOTFS_DIR'] = rootfs_dir | ||
196 | |||
197 | rootfs_dir = rootfs_dir_to_args(krootfs_dir) | ||
198 | |||
165 | wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir, | 199 | wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir, |
166 | native_sysroot, hdddir, staging_data_dir, scripts_path, | 200 | native_sysroot, hdddir, staging_data_dir, scripts_path, |
167 | image_output_dir, options.debug, options.properties_file) | 201 | image_output_dir, options.debug, options.properties_file) |