From nobody Sat Apr 27 23:27:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+57541+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57541+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1587143915; cv=none; d=zohomail.com; s=zohoarc; b=ZdPFPZkpC19nXMBZMZnCI1w2LaIVRF7szM3hzHWjkD9gBteWgTc8we+DObzOueVBDgyvrF55O4KIZFrVjuaNOcVMfpWIW6RmGUSS5pV/NN26mP2ZRPw1VfPSPCujKOmwV6/XFV+k8f5YeVEBnAV9M4qpX1Fzbb2+UDgqEEiwkUE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587143915; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=m6TU1ekgANom5A1BewVwoJp5kGlrMjy08jT+R85WjcA=; b=AyR+sqj5S5s2lYp8hGPf4DLVK/dn7KzxmTZYPzGTK75N6dCHOcWTuBUsZZUERBIomDccy/NpHqwkimxD5mJkvNqecSwa0xrzCrEeerKEzPKjHnwAPhzdHN7hSFp/mtXWbRRbtQgjJYrFE57Xe911vbn31+3f3hDgLHstFGWJdUA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57541+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1587143915481884.0235837598952; Fri, 17 Apr 2020 10:18:35 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id jpoeYY1788612xVZQLqyuQnk; Fri, 17 Apr 2020 10:18:35 -0700 X-Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web10.1640.1587143913856446116 for ; Fri, 17 Apr 2020 10:18:34 -0700 IronPort-SDR: od4GOYl2G4pRB7O5hqIulKnAy3bEiLNYnui6DfgYGL03R9paC3BRgyETtCuG9qSLYNg9jhN9ry RZStfe2LRt/w== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Apr 2020 10:18:33 -0700 IronPort-SDR: T/EY8aVSjFHJONEkqK1C/x0ryWw/wi0govAmbETJOmJLVPhICYfTEHIDcPhMX9dp7eAcxiEWtK PIG909Lg8Ckw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,395,1580803200"; d="scan'208";a="243070606" X-Received: from aedesimo-desk.amr.corp.intel.com ([10.7.159.171]) by orsmga007.jf.intel.com with ESMTP; 17 Apr 2020 10:18:32 -0700 From: "Ashley E Desimone" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya , Erik Bjorge , Bret Barkelew , Prince Agyeman Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v2 1/6] EdkRepo: Support Updated CFG Format Defining Multiple Manifest Repos Date: Fri, 17 Apr 2020 10:18:24 -0700 Message-Id: <20200417171829.23032-2-ashley.e.desimone@intel.com> In-Reply-To: <20200417171829.23032-1-ashley.e.desimone@intel.com> References: <20200417171829.23032-1-ashley.e.desimone@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ashley.e.desimone@intel.com X-Gm-Message-State: D2Nq8VwQqp3Uezdx1MW0YVIKx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1587143915; bh=hZS2xdLQdmCO2l+zfOJA5j4ESmKfi8TpZq1GXMHv/QQ=; h=Cc:Date:From:Reply-To:Subject:To; b=pwiZRAcQKGof/HR45uNn4tmo3tQ0feMZxPVtwNj/nBGRorVWKpuXzlgcCRuXy1nvm0g kSdzRMu/YmuOe4jDxd2bW6CioiCqT1c2hzTlrGRkfSWCL4SYQu5pPAOizN20CuUNlhJmJ UkHITbOColEH84M5k5Tzo02V/dcsTiRGinE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add support for the following cfg format to the BaseConfig class enabling it to be consumed by both the Global and User configuration file classes. CfgProps for each listed manifest repository will be dynamically added to the classes prop_list. Configuration Example: [Manifest_A] ... [Manifest_B] ... [manifest-repos] Manifest_A Manifest_B Signed-off-by: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Erik Bjorge Cc: Bret Barkelew Cc: Prince Agyeman Reviewed-by: Nate DeSimone --- edkrepo/config/config_factory.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/edkrepo/config/config_factory.py b/edkrepo/config/config_facto= ry.py index c342838..6c14f1b 100644 --- a/edkrepo/config/config_factory.py +++ b/edkrepo/config/config_factory.py @@ -85,6 +85,12 @@ class BaseConfig(): if os.path.isfile(self.filename): self.cfg.read(self.filename) =20 + if self.cfg.has_section('manifest-repos'): + for option in self.cfg.options('manifest-repos'): + self.prop_list.append(CfgProp('{}'.format(option), 'URL', = '{}-manifest_repo_url.'.format(option), None, False)) + self.prop_list.append(CfgProp('{}'.format(option), 'Branch= ', '{}-manifest_repo_branch'.format(option), None, False)) + self.prop_list.append(CfgProp('{}'.format(option), 'LocalP= ath', '{}-manifest_repo_local_path.'.format(option), None, False)) + # Create properties defined by the prop_list cfg_updated =3D False for prop in self.prop_list: --=20 2.16.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#57541): https://edk2.groups.io/g/devel/message/57541 Mute This Topic: https://groups.io/mt/73088009/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat Apr 27 23:27:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+57538+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57538+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1587143915; cv=none; d=zohomail.com; s=zohoarc; b=lShwhSXGLR9dh2N4FhkHlBBtuH9PW4v0QXvRM6xRjuiFj3ItVL30OoY/qGaMoNTq5K1sfwzc54ucPdNcnrp48JNXfpXVEuhDDE5SKwq/qGXPvtqEEc7GyVhcWhIw9sGcDYljq4wDnBvZwxZYz13BYY6qFWKgPSFVfZpsISBwSCo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587143915; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=5xVkc/efaRS9+oorVqBaX8zgnaVocydXdeviLeeha5c=; b=ilyp3/w6gwSvTrcdYVTOA4I5im3bq/9tsg1hZmxR1XtnOqzlw2CIrLlq8mBsHPHoFoEmRXb44yBBwlxMEwX3Hxj5o3A4laQr3kZOl4C8mVl3CPqvptvV0fv/AcxBAY89NyGUwJsnQatB3PfWaDG9Bh/oIP/U6+BHOx6pbu+frk8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57538+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1587143915030657.8257199347901; Fri, 17 Apr 2020 10:18:35 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id rhlVYY1788612xkBSABFwB5L; Fri, 17 Apr 2020 10:18:34 -0700 X-Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web10.1640.1587143913856446116 for ; Fri, 17 Apr 2020 10:18:34 -0700 IronPort-SDR: nWJ9Z08Um62+FiP4W42NpEeP7T3he/wmvZjmjWTbt/ncSSDWDB7bX1A12SlcDJ6iOXsPpY2iRh UD1G9uwKWIxg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Apr 2020 10:18:32 -0700 IronPort-SDR: lnWAZ1fdgbQqzy9dGWh+697iMYDPD4ljWgBeQW6OVGlN/3D/caEHdNoHIFhz7B3SgOXIZKkTY4 y2Ybbe6JwZJw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,395,1580803200"; d="scan'208";a="243070601" X-Received: from aedesimo-desk.amr.corp.intel.com ([10.7.159.171]) by orsmga007.jf.intel.com with ESMTP; 17 Apr 2020 10:18:32 -0700 From: "Ashley E Desimone" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya , Erik Bjorge , Bret Barkelew , Prince Agyeman Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v2 2/6] EdkRepo: Add new sections to edkrepo.cfg Date: Fri, 17 Apr 2020 10:18:25 -0700 Message-Id: <20200417171829.23032-3-ashley.e.desimone@intel.com> In-Reply-To: <20200417171829.23032-1-ashley.e.desimone@intel.com> References: <20200417171829.23032-1-ashley.e.desimone@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ashley.e.desimone@intel.com X-Gm-Message-State: a3UYBTNW7iZT9tROyp6Y5Dsnx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1587143914; bh=tqFQy2rMkN0o90H9ihukV3Dni4cSJsbgiXsFP8Hh3lM=; h=Cc:Date:From:Reply-To:Subject:To; b=oU8EZTigk8hjFhitnB6GQ5yDyUFqaVL1DIuTK1VgiPkMDWm1gGsjXhNVJYxJnR6lt/Y wVgsXrhAiOwGT/9/e0SicX/bryKEXLHeAJx3ikftMzt8+rJKUBtSFQLNwBcqpru20c9YV vSbrxM/rCACfFkGdH+LhXasLUvbyrthufcI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add manifest-repos and edk2-staging sections to the edkrepo.cfg to enable support of multiple manifest repositories. Signed-off-by: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Erik Bjorge Cc: Bret Barkelew Cc: Prince Agyeman Reviewed-by: Erik Bjorge Reviewed-by: Nate DeSimone --- edkrepo_installer/Vendor/edkrepo.cfg | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/edkrepo_installer/Vendor/edkrepo.cfg b/edkrepo_installer/Vendo= r/edkrepo.cfg index 7dcaf20..97ebdd2 100644 --- a/edkrepo_installer/Vendor/edkrepo.cfg +++ b/edkrepo_installer/Vendor/edkrepo.cfg @@ -1,3 +1,11 @@ +[manifest-repos] +edk2-staging =3D=20 + +[edk2-staging] +URL =3D https://github.com/tianocore/edk2-staging.git +Branch =3D EdkRepo-Manifest +LocalPath =3D edk2-staging-manifest-master + [manifest-repo] URL =3D https://github.com/tianocore/edk2-staging.git Branch =3D EdkRepo-Manifest --=20 2.16.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#57538): https://edk2.groups.io/g/devel/message/57538 Mute This Topic: https://groups.io/mt/73088006/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat Apr 27 23:27:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+57539+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57539+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1587143915; cv=none; d=zohomail.com; s=zohoarc; b=fqBA/0saiIvbzlWCpWycd3S1Iu2eMjsQFrRbrUc79A1/PlSchlNBZ8QLz4D2te6qJ8DUa8TEAnzTLChT6zk45w6EgvbT32fVeVmC3UT8E/Y2jqRjVKbTnuKeF1e7WSJPu+hEweQi9/8mTbxmj2I+1kDqiBrCv1hrmrhOiCigNZ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587143915; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=twWB9I0dIrkbNPHX3OgW5DJg6L1yf4QYTDexJA2O6bU=; b=F0isHexnK8XmmJfPiH/rOfo1u71Gbi9U41T/2tez+R3vFRshxiuGFDiNSY6Aw5zF6y3qCxqws015Gz9M73D1pbdywHdKKJ554IAUiOTOL1e8wljD5eGOBIhYR80B1KhQpVGvVQ8GzvtM8L+mCb/CnJDTUv5pEEb8W59WH2yLtf0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57539+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1587143915209782.036591301326; Fri, 17 Apr 2020 10:18:35 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id RSXYYY1788612xVrxxKR8ApK; Fri, 17 Apr 2020 10:18:34 -0700 X-Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web10.1641.1587143914271097917 for ; Fri, 17 Apr 2020 10:18:34 -0700 IronPort-SDR: j1pCP15iYi/dTl+XJO+LIsZ4wbUiLRI3Yk+z3FPieGNEnNsKBK82ry+ka0gzYq7SaH8wwO2Z/Z qVBFLpwP1VFA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Apr 2020 10:18:32 -0700 IronPort-SDR: zXdD0g9WKspLwNPJq3ukiFfFfuxZ9aWSepFfXTNGg46ND5aYHbowL8fFOPQ+ocvGvTqVpMw6Oj abQwgqikz23A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,395,1580803200"; d="scan'208";a="243070604" X-Received: from aedesimo-desk.amr.corp.intel.com ([10.7.159.171]) by orsmga007.jf.intel.com with ESMTP; 17 Apr 2020 10:18:32 -0700 From: "Ashley E Desimone" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya , Erik Bjorge , Bret Barkelew , Prince Agyeman Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v2 3/6] EdkRepo: Add the manifest_repo_list property to BaseConfig Date: Fri, 17 Apr 2020 10:18:26 -0700 Message-Id: <20200417171829.23032-4-ashley.e.desimone@intel.com> In-Reply-To: <20200417171829.23032-1-ashley.e.desimone@intel.com> References: <20200417171829.23032-1-ashley.e.desimone@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ashley.e.desimone@intel.com X-Gm-Message-State: hgGrjcsURzy7ZEl4Up9wc4Ejx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1587143914; bh=+8uBj7XIMdwFKUg6RyHEMnvFR10MMBwraiSkCNv/Qqk=; h=Cc:Date:From:Reply-To:Subject:To; b=cjyuGxWY2KrxQEPKkb/0WYtnWPhzKIEDbFPQMjGkvPQ80tD6IXcCVBebXpi2aNa4hU1 LFE2SRMBB//IbMJ8CmklZsVF7+gh8NUxCiGu97M6uG41xbm7m0Ia7qOeVbkhN7kEpiJ0J W7857oFgmY8oRpWmXZKSxc4V73jXUJQnQ74= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add the manifest_repo_list property to the BaseConfig class to return a list of manfiest repo sections in the config file. Signed-off-by: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Erik Bjorge Cc: Bret Barkelew Cc: Prince Agyeman Reviewed-by: Erik Bjorge Reviewed-by: Nate DeSimone --- edkrepo/config/config_factory.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/edkrepo/config/config_factory.py b/edkrepo/config/config_facto= ry.py index 6c14f1b..6f89589 100644 --- a/edkrepo/config/config_factory.py +++ b/edkrepo/config/config_factory.py @@ -113,6 +113,12 @@ class BaseConfig(): with open(self.filename, 'w') as cfg_stream: self.cfg.write(cfg_stream) =20 + @property + def manifest_repo_list(self): + """Returns a list of available manifest repos""" + if self.cfg.has_section('manifest-repos'): + return self.cfg.options('manifest-repos') + class GlobalConfig(BaseConfig): """ Class access structure for the edkrepo.cfg file. This file is read on= ly and maintained by the --=20 2.16.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#57539): https://edk2.groups.io/g/devel/message/57539 Mute This Topic: https://groups.io/mt/73088007/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat Apr 27 23:27:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+57542+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57542+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1587143915; cv=none; d=zohomail.com; s=zohoarc; b=XHomof0y8OxF6l1gvAT97GmSbtICDPWRek3itGIUVfQwnbHTDpxT9yszrWqExoTXc/xQLq90U70WV6W1mv97JCRtPLs4NXuHExk1XJDRs5c6OkIhT6Ishf32OaftXxcYABAwCq1EyogEUEl3XM5eCuTaE4N3cbVSi75WF7a+yts= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587143915; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=k9nno0YKrzIjuil0FGhs+4D6pGI08mUOKis4V8nomDw=; b=OELkHmKZRAIHH92bSXz9a25k2zHimGv8DN9XoBAJy/VkccEgBlk4RUPbIKVMSl2fPdVOkZhSbmeFCC021CJyOBRHHMlMZq2Buq7sWGsnIgPUaKPK4VPHJmO8fOWVZ9iiGJn8OevmxuZdsTUbzHTIxnAWFh6VXqOuK7kL4i9casY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57542+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1587143915414664.0841085515276; Fri, 17 Apr 2020 10:18:35 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id PL1TYY1788612xAI7o5gI4bB; Fri, 17 Apr 2020 10:18:35 -0700 X-Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web10.1641.1587143914271097917 for ; Fri, 17 Apr 2020 10:18:34 -0700 IronPort-SDR: qFhBPpAvLNiM7/ShsGWS1edJodRwSehUPFC5d/EKvnwaw51oqu5xiZ6rP3qmKUVpELJBTKt9c8 5u0AI5JGBtwg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Apr 2020 10:18:33 -0700 IronPort-SDR: USJDwImpUDXvevKWePkbFdS47gqETcL7fuhA1d6QW9b71k3bcfiu0ph5gqf2V93bXpcoTJOG0V ihmwnk98l7BQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,395,1580803200"; d="scan'208";a="243070609" X-Received: from aedesimo-desk.amr.corp.intel.com ([10.7.159.171]) by orsmga007.jf.intel.com with ESMTP; 17 Apr 2020 10:18:32 -0700 From: "Ashley E Desimone" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya , Erik Bjorge , Bret Barkelew , Prince Agyeman Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v2 4/6] EdkRepo: Add manifest_repo_props() Date: Fri, 17 Apr 2020 10:18:27 -0700 Message-Id: <20200417171829.23032-5-ashley.e.desimone@intel.com> In-Reply-To: <20200417171829.23032-1-ashley.e.desimone@intel.com> References: <20200417171829.23032-1-ashley.e.desimone@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ashley.e.desimone@intel.com X-Gm-Message-State: mejReN0obBCmCrAXQYAwIIXlx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1587143915; bh=j5f8WB67JLLOM/S6XaFxKHHCJyTozId4pqQOWnTCpv4=; h=Cc:Date:From:Reply-To:Subject:To; b=SeVrMxWaaNCQMzbLdOpysD+WY6ka5/7+wRvwa0IBXrzfB8hR97Z3upZ1TkectiZrwvO lQH17VRNgY0GIB4bA0hxZlYfzWYxTD4Irkoe7PAnjoreC7rRQ5DWtpos+Wcj4YFGF3ZiE Hn0aS5pH4auFN6CeZnaiZmPXY3SJSfrKFJo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add the manifest_repo_props() function to the BaseConfig class which returns a list of all CfgProp objects for a given manifest repository. Signed-off-by: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Erik Bjorge Cc: Bret Barkelew Cc: Prince Agyeman Reviewed-by: Erik Bjorge Reviewed-by: Nate DeSimone --- edkrepo/config/config_factory.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/edkrepo/config/config_factory.py b/edkrepo/config/config_facto= ry.py index 6f89589..1afa221 100644 --- a/edkrepo/config/config_factory.py +++ b/edkrepo/config/config_factory.py @@ -118,6 +118,13 @@ class BaseConfig(): """Returns a list of available manifest repos""" if self.cfg.has_section('manifest-repos'): return self.cfg.options('manifest-repos') + =20 + def manifest_repo_props(self, manifest_repo): + """ + Returns a list of cfg_prop objects that pertain to a given manifest + repo + """ + return [x for x in self.prop_list if manifest_repo in x.name] =20 class GlobalConfig(BaseConfig): """ --=20 2.16.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#57542): https://edk2.groups.io/g/devel/message/57542 Mute This Topic: https://groups.io/mt/73088010/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat Apr 27 23:27:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+57543+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57543+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1587143915; cv=none; d=zohomail.com; s=zohoarc; b=T19zc6TRdTd6+LZt+h4TQA4De8rej+UeZxfDFyZDymgFakglNXRaMsamtyNApntjU2bVEQaakvEiTHozSAoTETnIVUqkjIxyKguOaR/bmqs+ik6BhY56K8LILYCMrEPKsLaAuXqXfG30/quYeV3/uPmaAGtnTBfZR39/vKEtQBU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587143915; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=4V9Lmuj3eLLmJqFKI1lLuLph7DFZwAsU2WfbcXOO+2k=; b=DzPcUGhvptvG+w+OLv/f+Mx3tgp1fo/Eiexhse3+xevcUFblKxN4SSEHzxCFLCwU9MmCAaAMudg1G3O2x0QBnXqeCkZt500erzHrwxpO3lT4nQ6QtcTYcKDFkb4/3pPlkj1xUuxLc2Kqkmpj0FkGNm0XIXf+aeM/89mEX9X/UxU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57543+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1587143915592928.045509895886; Fri, 17 Apr 2020 10:18:35 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id FTCQYY1788612x9RvKzDRwwN; Fri, 17 Apr 2020 10:18:35 -0700 X-Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web10.1640.1587143913856446116 for ; Fri, 17 Apr 2020 10:18:34 -0700 IronPort-SDR: NDFbkLlgHHvE5CuLifNRS3mE7ddCRq/2ObDmEH4jk7lqD8SQj7k2h/ceNmp9BcnLocVzfcX/Lm tTxlx9Tt9vLA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Apr 2020 10:18:33 -0700 IronPort-SDR: Vl8qpl3mJ2RfMRiRqEbaMkUBrl4U8OP1+Isd9JwZuzF6my5IV0LimPyRBNACy8sEBKMoeRDpG8 IFw252VksV8g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,395,1580803200"; d="scan'208";a="243070612" X-Received: from aedesimo-desk.amr.corp.intel.com ([10.7.159.171]) by orsmga007.jf.intel.com with ESMTP; 17 Apr 2020 10:18:32 -0700 From: "Ashley E Desimone" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya , Erik Bjorge , Bret Barkelew , Prince Agyeman Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v2 5/6] EdkRepo: Move edkrepo_global_data directory to BaseConfig Date: Fri, 17 Apr 2020 10:18:28 -0700 Message-Id: <20200417171829.23032-6-ashley.e.desimone@intel.com> In-Reply-To: <20200417171829.23032-1-ashley.e.desimone@intel.com> References: <20200417171829.23032-1-ashley.e.desimone@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ashley.e.desimone@intel.com X-Gm-Message-State: F2cuo9aXIXiL5FBESQpzsbtwx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1587143915; bh=RQlk/8mXMvh9pBdjULTxQ1dP8cK5KB3QGDSYV1YB69U=; h=Cc:Date:From:Reply-To:Subject:To; b=N+SP1jGXW16umYFNK4qYeIVCdzFRIz0VDnbDp0L7jbYf4The8bEPMdI6fQutPxPi3kx tB1HkdmkYW7aGWyrXi+Gid3Z82l3mLlttdpAdjnlHSsPEtt2SG9IwxCgpdn+bs9U2Jiar 3lo/mR4cVJnqEK1nfN9XIutZTLPs9lLMOsg= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Move the edkrepo_global_data_directory from the GlobalConfig class to the base config class. Updated the assignments of self.filename in both the GlobalConfig and the GlobalUserConfig classes as well as the initializaion of the BaseConfig class to use get_edkrepo_global_data_directory() Signed-off-by: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Erik Bjorge Cc: Bret Barkelew Cc: Prince Agyeman Reviewed-by: Erik Bjorge Reviewed-by: Nate DeSimone --- edkrepo/config/config_factory.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/edkrepo/config/config_factory.py b/edkrepo/config/config_facto= ry.py index 1afa221..4ae06f6 100644 --- a/edkrepo/config/config_factory.py +++ b/edkrepo/config/config_factory.py @@ -77,10 +77,11 @@ class BaseConfig(): for the class. Property generation and verification is based off of a= list of CfgProp classes. """ prop_list =3D [] - def __init__(self, filename, read_only=3DTrue): + def __init__(self, filename, global_data_dir, read_only=3DTrue): # Do basic initialization of private variables self.read_only =3D read_only self.filename =3D filename + self.global_data_dir =3D global_data_dir self.cfg =3D configparser.ConfigParser(allow_no_value=3DTrue, deli= miters=3D'=3D') if os.path.isfile(self.filename): self.cfg.read(self.filename) @@ -132,8 +133,7 @@ class GlobalConfig(BaseConfig): edkrepo installer. """ def __init__(self): - self.edkrepo_global_data_directory =3D get_edkrepo_global_data_dir= ectory() - self.filename =3D os.path.join(self.edkrepo_global_data_directory,= "edkrepo.cfg") + self.filename =3D os.path.join(get_edkrepo_global_data_directory()= , "edkrepo.cfg") self.prop_list =3D [ CfgProp('manifest-repo', 'URL', 'manifest_repo_url', None,= True), CfgProp('manifest-repo', 'Branch', 'manifest_repo_branch',= None, True), @@ -148,7 +148,7 @@ class GlobalConfig(BaseConfig): CfgProp('preferred-entry-point', 'entry-point', 'pref_entr= y_point', None, True)] if not os.path.isfile(self.filename): raise EdkrepoGlobalConfigNotFoundException(humble.GLOBAL_CFG_N= OT_FOUND.format(self.filename)) - super().__init__(self.filename, True) + super().__init__(self.filename, get_edkrepo_global_data_directory(= ), True) =20 @property def preferred_entry(self): @@ -165,7 +165,7 @@ class GlobalConfig(BaseConfig): @property def manifest_repo_abs_local_path(self): """Provides an absolute path to the manifest repo based on configu= ration file values.""" - return os.path.join(self.edkrepo_global_data_directory, self.manif= est_repo_local_path) + return os.path.join(self.global_data_dir, self.manifest_repo_local= _path) =20 @property def sparsecheckout_data(self): @@ -192,7 +192,7 @@ class GlobalUserConfig(BaseConfig): CfgProp('scm', 'mirror_geo', 'geo', 'none', False), CfgProp('send-review', 'max-patch-set', 'max_patch_set', '10',= False) ] - super().__init__(self.filename, False) + super().__init__(self.filename, get_edkrepo_global_data_directory(= ), False) =20 @property def max_patch_set_int(self): --=20 2.16.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#57543): https://edk2.groups.io/g/devel/message/57543 Mute This Topic: https://groups.io/mt/73088011/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat Apr 27 23:27:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+57540+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57540+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1587143915; cv=none; d=zohomail.com; s=zohoarc; b=WyVm8VMLSM+E3CNlEuoU0ioutQhIF8uG++CFd1OwcUzHyQNb4LcnuCBKvo8shXjrVvms/rOOs5ytvxyYdA+aVVLm1tjK+SCQuuatcjZabK1C5YCT//y2trkzXWjwwgnCKjNLMqgLqHuMH7cirtOoQIvyXse1aijhS1DO3CZhvXc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587143915; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=VaJ0kjlux13WbD4IW21jugC4N5I6QOsIy+juPQPDREw=; b=mv0LOHhSyFgL9+yKRp54kRxfhzR5nLkwyCds4ad3WY9/RrniVY2jf8D+ik5+/yUTDBebqinxXNg9zOEl0day+u/+Y2I9I7BKb+Hhbt0GxeDeaSJTN4wIBx5XUntGMF/awoMMqOTv2LyN6yVbpunY3Dup7lruAAv9vF7p6VhGw0o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57540+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 158714391515397.09067371804781; Fri, 17 Apr 2020 10:18:35 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id H0yGYY1788612x5QpmiUXzBA; Fri, 17 Apr 2020 10:18:34 -0700 X-Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web12.1731.1587143914323167629 for ; Fri, 17 Apr 2020 10:18:34 -0700 IronPort-SDR: +ed16TKhnoDo4Cb/nJzudlPo70+DEZNVPhctGWn68IpUqHOfbV3kcljyOTc8hWvfe8UWmbsiB5 cZwIk0SGgPZA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Apr 2020 10:18:33 -0700 IronPort-SDR: Tkx1Nedl+MgB+epYaV0h+HKdpo9pM9Gp3Y+BW0xiVNpfrPhe/nkVCvq8Jy9mRMcOyxoBTfzIOk Qptbg4NPNXQw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,395,1580803200"; d="scan'208";a="243070614" X-Received: from aedesimo-desk.amr.corp.intel.com ([10.7.159.171]) by orsmga007.jf.intel.com with ESMTP; 17 Apr 2020 10:18:32 -0700 From: "Ashley E Desimone" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya , Erik Bjorge , Bret Barkelew , Prince Agyeman Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v2 6/6] EdkRepo: Add 'get' functions for Manifest Repo data Date: Fri, 17 Apr 2020 10:18:29 -0700 Message-Id: <20200417171829.23032-7-ashley.e.desimone@intel.com> In-Reply-To: <20200417171829.23032-1-ashley.e.desimone@intel.com> References: <20200417171829.23032-1-ashley.e.desimone@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ashley.e.desimone@intel.com X-Gm-Message-State: bF5VSdukntXrt3jHxtaujzStx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1587143914; bh=G1IdnBvZwISm4rj86QORun9+Ip+3zpKC5RHTJ21wTFw=; h=Cc:Date:From:Reply-To:Subject:To; b=VjH0O1Y3dIUHLvsFSPcMqx+x2UiGHxM8HOVFToQU8vlCqm0aOgeB46LFyayHEq+IOUS XeoVFuOkp8XkvaveLH/l9ac8QYrybd4yFkWii42IA2bQSmAI2dSwZNj/doRCswATrDQmj sGz0e/kq3egmtzYV5Afy6Xh774iEs1IGRK0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Added functions to get the URL, LocalPath, Branch and the absolute path for individual manifest repositories to the BaseConfig class. Signed-off-by: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Erik Bjorge Cc: Bret Barkelew Cc: Prince Agyeman Reviewed-by: Erik Bjorge Reviewed-by: Nate DeSimone --- edkrepo/config/config_factory.py | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/edkrepo/config/config_factory.py b/edkrepo/config/config_facto= ry.py index 4ae06f6..90f393c 100644 --- a/edkrepo/config/config_factory.py +++ b/edkrepo/config/config_factory.py @@ -127,6 +127,43 @@ class BaseConfig(): """ return [x for x in self.prop_list if manifest_repo in x.name] =20 + def get_manifest_repo_url(self, manifest_repo): + """=20 + Returns the URL value for a given manifest repo based on config + file contents. + """ + for prop in self.manifest_repo_props(manifest_repo): + if 'URL' =3D=3D prop.key: + return self.cfg[prop.section][prop.key] + return None + + def get_manifest_repo_branch(self, manifest_repo): + """ + Returns the Branch value for a given manifest repo based on config= file + contents. + """ + for prop in self.manifest_repo_props(manifest_repo): + if 'Branch' =3D=3D prop.key: + return self.cfg[prop.section][prop.key] + return None + + def get_manifest_repo_local_path(self, manifest_repo): + """ + Returns the Local path value for a given manifest repo based on co= nfig + file contents. + """ + for prop in self.manifest_repo_props(manifest_repo): + if 'LocalPath' =3D=3D prop.key: + return self.cfg[prop.section][prop.key] + return None + + def manifest_repo_abs_path(self, manifest_repo): + """ + Returns the absolute path of a single manifest repo based on config + file contents and the global_data_dir location. + """ + return os.path.join(self.global_data_dir, self.get_manifest_repo_l= ocal_path(manifest_repo)) + class GlobalConfig(BaseConfig): """ Class access structure for the edkrepo.cfg file. This file is read on= ly and maintained by the --=20 2.16.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#57540): https://edk2.groups.io/g/devel/message/57540 Mute This Topic: https://groups.io/mt/73088008/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-