From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web10.5538.1572306430114379689 for ; Mon, 28 Oct 2019 16:47:10 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: nathaniel.l.desimone@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Oct 2019 16:47:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,241,1569308400"; d="scan'208";a="198209903" Received: from orsmsx107.amr.corp.intel.com ([10.22.240.5]) by fmsmga008.fm.intel.com with ESMTP; 28 Oct 2019 16:47:09 -0700 Received: from orsmsx113.amr.corp.intel.com ([169.254.9.28]) by ORSMSX107.amr.corp.intel.com ([169.254.1.115]) with mapi id 14.03.0439.000; Mon, 28 Oct 2019 16:47:09 -0700 From: "Nate DeSimone" To: "devel@edk2.groups.io" , "Desimone, Ashley E" CC: "Pandya, Puja" Subject: Re: [edk2-devel] [edk2-staging/EdkRepo][PATCH 1/3] EdkRepo: Multiple Command Package Configuration Support Thread-Topic: [edk2-devel] [edk2-staging/EdkRepo][PATCH 1/3] EdkRepo: Multiple Command Package Configuration Support Thread-Index: AQHVjeakvraq+wlKD0uifbqv2bfuZKdwuB3A Date: Mon, 28 Oct 2019 23:47:08 +0000 Message-ID: <02A34F284D1DA44BB705E61F7180EF0AB5B7F8EE@ORSMSX113.amr.corp.intel.com> References: <20191028232245.6712-1-ashley.e.desimone@intel.com> In-Reply-To: <20191028232245.6712-1-ashley.e.desimone@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMTM2NmU3NTEtMjIxYy00NDJjLTk4MTUtZTU0MTIyYzZhODE1IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoidm8yMWJRdmFWekdHOXgyRVA2eFEyOTQ4bjZabnp2eFdTQmdyZVNrYU85NXJFcUFINVlSM29MRkFaazRZSFNLeiJ9 x-ctpclassification: CTP_NT x-originating-ip: [10.22.254.138] MIME-Version: 1.0 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Nate DeSimone -----Original Message----- From: devel@edk2.groups.io On Behalf Of Desimone, A= shley E Sent: Monday, October 28, 2019 4:23 PM To: devel@edk2.groups.io Cc: Desimone, Nathaniel L ; Pandya, Puja <= puja.pandya@intel.com> Subject: [edk2-devel] [edk2-staging/EdkRepo][PATCH 1/3] EdkRepo: Multiple = Command Package Configuration Support Add support for a new required sections, command-packages and preferred-co= mmand-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_fact= ory.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', 'sparsechecko= ut_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, Tr= ue)] + CfgProp('git-ver', 'recommended', 'rec_git_ver', None, Tr= ue), + CfgProp('command-packages', 'packages', 'command_packages= ', None, True), + CfgProp('preferred-command-package',=20 + 'preferred-package', 'pref_pkg', None, True)] if not os.path.isfile(self.filename): raise EdkrepoGlobalConfigNotFoundException("edkrepo global co= nfig file {} does not exist".format(self.filename)) super().__init__(self.filename, True) =20 + @property + def command_packages_list(self): + initial_list =3D self.command_packages.split('|') + pkg_list =3D [] + 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 config= uration file values.""" diff --git a/edkrepo_installer/Vendor/edkrepo.cfg b/edkrepo_installer/Vend= or/edkrepo.cfg index 08724fd..0312c74 100644 --- a/edkrepo_installer/Vendor/edkrepo.cfg +++ b/edkrepo_installer/Vendor/edkrepo.cfg @@ -7,6 +7,12 @@ LocalPath =3D manifest-master minimum =3D 2.13.0 recomm= ended =3D 2.16.2 =20 +[command-packages] +packages =3D edkrepo.commands + +[preferred-command-package] +preferred-package =3D edkrepo.commands + [sparsecheckout] always_include =3D BaseTools|Conf|*.* always_exclude =3D -- 2.16.2.windows.1