From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web12.5095.1572304978964245437 for ; Mon, 28 Oct 2019 16:22:59 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: ashley.e.desimone@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Oct 2019 16:22:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,241,1569308400"; d="scan'208";a="283071864" Received: from aedesimo-desk.amr.corp.intel.com ([10.7.159.171]) by orsmga001.jf.intel.com with ESMTP; 28 Oct 2019 16:22:58 -0700 From: "Desimone, Ashley E" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya Subject: [edk2-staging/EdkRepo][PATCH 1/3] EdkRepo: Multiple Command Package Configuration Support Date: Mon, 28 Oct 2019 16:22:43 -0700 Message-Id: <20191028232245.6712-1-ashley.e.desimone@intel.com> X-Mailer: git-send-email 2.16.2.windows.1 Add support for a new required sections, command-packages and preferred-command-packages,to the GlobalConfig class. Additionaly update the existing edkrepo.cfg file. Signed-off-by: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya --- edkrepo/config/config_factory.py | 12 +++++++++++- edkrepo_installer/Vendor/edkrepo.cfg | 6 ++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/edkrepo/config/config_factory.py b/edkrepo/config/config_factory.py index 7a39554..38844d7 100644 --- a/edkrepo/config/config_factory.py +++ b/edkrepo/config/config_factory.py @@ -123,11 +123,21 @@ class GlobalConfig(BaseConfig): CfgProp('sparsecheckout', 'always_exclude', 'sparsecheckout_always_exclude', None, True), CfgProp('f2f-cherry-pick', 'ignored_folder_substrings', 'f2f_cp_ignored_folder_substrings'), CfgProp('git-ver', 'minimum', 'minimum_req_git_ver', None, True), - CfgProp('git-ver', 'recommended', 'rec_git_ver', None, True)] + CfgProp('git-ver', 'recommended', 'rec_git_ver', None, True), + CfgProp('command-packages', 'packages', 'command_packages', None, True), + CfgProp('preferred-command-package', 'preferred-package', 'pref_pkg', None, True)] if not os.path.isfile(self.filename): raise EdkrepoGlobalConfigNotFoundException("edkrepo global config file {} does not exist".format(self.filename)) super().__init__(self.filename, True) + @property + def command_packages_list(self): + initial_list = self.command_packages.split('|') + pkg_list = [] + for pkg in initial_list: + pkg_list.append(pkg.strip()) + return pkg_list + @property def manifest_repo_abs_local_path(self): """Provides an absolute path to the manifest repo based on configuration file values.""" diff --git a/edkrepo_installer/Vendor/edkrepo.cfg b/edkrepo_installer/Vendor/edkrepo.cfg index 08724fd..0312c74 100644 --- a/edkrepo_installer/Vendor/edkrepo.cfg +++ b/edkrepo_installer/Vendor/edkrepo.cfg @@ -7,6 +7,12 @@ LocalPath = manifest-master minimum = 2.13.0 recommended = 2.16.2 +[command-packages] +packages = edkrepo.commands + +[preferred-command-package] +preferred-package = edkrepo.commands + [sparsecheckout] always_include = BaseTools|Conf|*.* always_exclude = -- 2.16.2.windows.1