wic: removed unused command line option
Removed -i/--infile wic command line option. Removed properties_file and properties arguments of wic_create function. (From OE-Core rev: 6b81c89878236b2ef8d8b8217f2e33286b49dab6) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
a4da21d92f
commit
81e469b030
|
@ -178,9 +178,8 @@ def list_source_plugins():
|
||||||
print " %s" % plugin
|
print " %s" % plugin
|
||||||
|
|
||||||
|
|
||||||
def wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir,
|
def wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir,
|
||||||
native_sysroot, scripts_path, image_output_dir, debug,
|
native_sysroot, scripts_path, image_output_dir, debug):
|
||||||
properties_file, properties=None):
|
|
||||||
"""Create image
|
"""Create image
|
||||||
|
|
||||||
wks_file - user-defined OE kickstart file
|
wks_file - user-defined OE kickstart file
|
||||||
|
@ -190,8 +189,6 @@ def wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir,
|
||||||
native_sysroot - absolute path to the build's native sysroots dir
|
native_sysroot - absolute path to the build's native sysroots dir
|
||||||
scripts_path - absolute path to /scripts dir
|
scripts_path - absolute path to /scripts dir
|
||||||
image_output_dir - dirname to create for image
|
image_output_dir - dirname to create for image
|
||||||
properties_file - use values from this file if nonempty i.e no prompting
|
|
||||||
properties - use values from this string if nonempty i.e no prompting
|
|
||||||
|
|
||||||
Normally, the values for the build artifacts values are determined
|
Normally, the values for the build artifacts values are determined
|
||||||
by 'wic -e' from the output of the 'bitbake -e' command given an
|
by 'wic -e' from the output of the 'bitbake -e' command given an
|
||||||
|
|
|
@ -149,7 +149,6 @@ NAME
|
||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
wic create <wks file or image name> [-o <DIRNAME> | --outdir <DIRNAME>]
|
wic create <wks file or image name> [-o <DIRNAME> | --outdir <DIRNAME>]
|
||||||
[-i <JSON PROPERTY FILE> | --infile <JSON PROPERTY_FILE>]
|
|
||||||
[-e | --image-name] [-s, --skip-build-check] [-D, --debug]
|
[-e | --image-name] [-s, --skip-build-check] [-D, --debug]
|
||||||
[-r, --rootfs-dir] [-b, --bootimg-dir]
|
[-r, --rootfs-dir] [-b, --bootimg-dir]
|
||||||
[-k, --kernel-dir] [-n, --native-sysroot] [-f, --build-rootfs]
|
[-k, --kernel-dir] [-n, --native-sysroot] [-f, --build-rootfs]
|
||||||
|
@ -219,12 +218,6 @@ DESCRIPTION
|
||||||
The -o option can be used to place the image in a directory with a
|
The -o option can be used to place the image in a directory with a
|
||||||
different name and location.
|
different name and location.
|
||||||
|
|
||||||
As an alternative to the wks file, the image-specific properties
|
|
||||||
that define the values that will be used to generate a particular
|
|
||||||
image can be specified on the command-line using the -i option and
|
|
||||||
supplying a JSON object consisting of the set of name:value pairs
|
|
||||||
needed by image creation.
|
|
||||||
|
|
||||||
The set of properties available for a given image type can be
|
The set of properties available for a given image type can be
|
||||||
listed using the 'wic list' command.
|
listed using the 'wic list' command.
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -91,8 +91,6 @@ def wic_create_subcommand(args, usage_str):
|
||||||
|
|
||||||
parser.add_option("-o", "--outdir", dest="outdir",
|
parser.add_option("-o", "--outdir", dest="outdir",
|
||||||
action="store", help="name of directory to create image in")
|
action="store", help="name of directory to create image in")
|
||||||
parser.add_option("-i", "--infile", dest="properties_file",
|
|
||||||
action="store", help="name of file containing the values for image properties as a JSON file")
|
|
||||||
parser.add_option("-e", "--image-name", dest="image_name",
|
parser.add_option("-e", "--image-name", dest="image_name",
|
||||||
action="store", help="name of the image to use the artifacts from e.g. core-image-sato")
|
action="store", help="name of the image to use the artifacts from e.g. core-image-sato")
|
||||||
parser.add_option("-r", "--rootfs-dir", dest="rootfs_dir",
|
parser.add_option("-r", "--rootfs-dir", dest="rootfs_dir",
|
||||||
|
@ -132,7 +130,7 @@ def wic_create_subcommand(args, usage_str):
|
||||||
if not options.image_name:
|
if not options.image_name:
|
||||||
options.build_check = False
|
options.build_check = False
|
||||||
|
|
||||||
if options.build_check and not options.properties_file:
|
if options.build_check:
|
||||||
print "Checking basic build environment..."
|
print "Checking basic build environment..."
|
||||||
if not engine.verify_build_env():
|
if not engine.verify_build_env():
|
||||||
print "Couldn't verify build environment, exiting\n"
|
print "Couldn't verify build environment, exiting\n"
|
||||||
|
@ -225,9 +223,9 @@ def wic_create_subcommand(args, usage_str):
|
||||||
rootfs_dir = rootfs_dir_to_args(krootfs_dir)
|
rootfs_dir = rootfs_dir_to_args(krootfs_dir)
|
||||||
|
|
||||||
print "Creating image(s)...\n"
|
print "Creating image(s)...\n"
|
||||||
engine.wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir,
|
engine.wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir,
|
||||||
native_sysroot, scripts_path, image_output_dir,
|
native_sysroot, scripts_path, image_output_dir,
|
||||||
options.debug, options.properties_file)
|
options.debug)
|
||||||
|
|
||||||
|
|
||||||
def wic_list_subcommand(args, usage_str):
|
def wic_list_subcommand(args, usage_str):
|
||||||
|
|
Loading…
Reference in New Issue