From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mail.openembedded.org (Postfix) with ESMTP id 0FA6A73E65 for ; Wed, 17 Jun 2015 13:53:16 +0000 (UTC) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP; 17 Jun 2015 06:53:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,632,1427785200"; d="scan'208";a="748356999" Received: from linux.intel.com ([10.23.219.25]) by orsmga002.jf.intel.com with ESMTP; 17 Jun 2015 06:53:16 -0700 Received: from vmed.fi.intel.com (vmed.fi.intel.com [10.237.72.65]) by linux.intel.com (Postfix) with ESMTP id 095CD6A4083; Wed, 17 Jun 2015 06:52:39 -0700 (PDT) From: Ed Bartosh To: openembedded-core@lists.openembedded.org Date: Wed, 17 Jun 2015 16:52:41 +0300 Message-Id: <1434549161-12235-1-git-send-email-ed.bartosh@linux.intel.com> X-Mailer: git-send-email 2.1.4 Subject: [wic][PATCH] wic: removed unused command line option X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jun 2015 13:53:20 -0000 Removed -i/--infile wic command line option. Removed properties_file and properties arguments of wic_create function. Signed-off-by: Ed Bartosh --- scripts/lib/image/engine.py | 7 ++----- scripts/wic | 8 +++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py index c568d69..29099ee 100644 --- a/scripts/lib/image/engine.py +++ b/scripts/lib/image/engine.py @@ -178,9 +178,8 @@ def list_source_plugins(): print " %s" % plugin -def wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir, - native_sysroot, scripts_path, image_output_dir, debug, - properties_file, properties=None): +def wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir, + native_sysroot, scripts_path, image_output_dir, debug): """Create image 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 scripts_path - absolute path to /scripts dir 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 by 'wic -e' from the output of the 'bitbake -e' command given an diff --git a/scripts/wic b/scripts/wic index a38ecc0..7b0c3b2 100755 --- a/scripts/wic +++ b/scripts/wic @@ -91,8 +91,6 @@ def wic_create_subcommand(args, usage_str): parser.add_option("-o", "--outdir", dest="outdir", 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", 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", @@ -132,7 +130,7 @@ def wic_create_subcommand(args, usage_str): if not options.image_name: options.build_check = False - if options.build_check and not options.properties_file: + if options.build_check: print "Checking basic build environment..." if not engine.verify_build_env(): 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) 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, - options.debug, options.properties_file) + options.debug) def wic_list_subcommand(args, usage_str): -- 2.1.4