From nobody Sat May 4 08:08:25 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+57488+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+57488+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1587094293; cv=none; d=zohomail.com; s=zohoarc; b=PUuPnPkd+KT8uKpGvGFhnLi3dPt9pW045K6dnFMuoWQpjyPr6v/Y+VNkldliA1ysLhFzxVTLHA4lnpKsGg6yoY+EB+JzrwqS3UAy8UERDnYb2NItcYRUQyf4cXRtNFUALcuvQwih5RxcBXQ5fnmmU4Ybj2L/q1Ot/A+XOIL1BYE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587094293; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=StD9eT+oRFwOjlHzdi1QrLVHps79b2QqjU/Sy3t0+P4=; b=Utwe+PParzVkPPU/915w6oin5gxAfoFBDtceM9EycBgtKQf6q0imJRZS3MgfEtrJB4RGuhHxON/7PZ9LKjTprGsLK7gMQE3hzI/5cNCVShDxiZ5sqQ7GHwRIKqsi8baFiieAmtpoXRBhUZaAC9qhahhyXRkTsJABbqhh0uS2agc= 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+57488+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 1587094293137984.8877673136669; Thu, 16 Apr 2020 20:31:33 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 6HcAYY1788612xC0oeBXkVFk; Thu, 16 Apr 2020 20:31:32 -0700 X-Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web10.3735.1587094291698496893 for ; Thu, 16 Apr 2020 20:31:31 -0700 IronPort-SDR: Avg590B34nNyXWwXojyX13uj2gqEJv7PFC0PtHLiO7+xdQqb7HMamRsS3n0BbPh4GBqCeFrqiA rEIvsCJz28ng== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2020 20:31:30 -0700 IronPort-SDR: TPL5zJrz+Gnxocz+lc3bWPagFkOxex5j9TVv89k34PHQ0nFgeH5/PbDyoQbHbpIyQgeOh3747g yD4RP6ojQweA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,393,1580803200"; d="scan'208";a="333066518" X-Received: from aedesimo-desk.amr.corp.intel.com ([10.7.159.171]) by orsmga001.jf.intel.com with ESMTP; 16 Apr 2020 20:31:30 -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 1/6] EdkRepo: Support Updated CFG Format Defining Multiple Manifest Repos Date: Thu, 16 Apr 2020 20:31:18 -0700 Message-Id: <20200417033123.34972-2-ashley.e.desimone@intel.com> In-Reply-To: <20200417033123.34972-1-ashley.e.desimone@intel.com> References: <20200417033123.34972-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: cgE4jRhO8jArXx3MjyQD5jRox1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1587094292; bh=XRYpDyTK2k6RITM4FHyA8NiQRmndLMd472vcW9azEJU=; h=Cc:Date:From:Reply-To:Subject:To; b=j66R3A68SsVvxecD/FuHdT/icxzq5qfhiKXZSDLy2BykO9HWe7y9RIqnj/yoLpRQ4IJ NB+ehCFI4agng1KfL2JrqaAJ7k48m0T3VtDv/eueiEHqIwtQXa4Uxs2bmE7MmuHNCrzcH ECvdWrQpb554B8fcs15+ePerWb35ppDn6G0= 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: Erik Bjorge --- 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 (#57488): https://edk2.groups.io/g/devel/message/57488 Mute This Topic: https://groups.io/mt/73070620/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 May 4 08:08:25 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+57487+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+57487+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1587094293; cv=none; d=zohomail.com; s=zohoarc; b=QmGPbkvL8op8lQaMV29SOp9h/zttnHFzKC2tyGaKVeBN3h2C99MJ5ZPraucPE+eFb+6XAC7WUjybRI1drxzNCU2m1xPMjtPkazM/bgVZ11vpkU/WYJjR0qUm5DY+qRXIUHo7G7GchGqkp+SYuKMfz6YWgGiaV49kwiEfMqVG4SE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587094293; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=9CoS4DXwr2Oyf1zswT7Pb/NG45B+zr7hPMPf0MZK1ZU=; b=PYcHJr4VDTGw6IC8ycVrgAI9Y7Qpm4Fc630bfCtuzQrz2LdcUI2I1xdRclopyWXsPy7bCILmtI3Hh92eCcZxXp5m4T+TLXDkGv4mwxcR7p10vmtMF7FFU+DSWo683rDCpU6A/t6Ulua9o7MPrtDGVMQ54t8sehf8TUHjK2n/4eY= 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+57487+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 1587094293137543.0595178352896; Thu, 16 Apr 2020 20:31:33 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id fNDbYY1788612xiRt9s58WJv; Thu, 16 Apr 2020 20:31:32 -0700 X-Received: from mga14.intel.com (mga14.intel.com []) by mx.groups.io with SMTP id smtpd.web10.3734.1587094291266785285 for ; Thu, 16 Apr 2020 20:31:31 -0700 IronPort-SDR: 8Y6OK7Seuv/Ti+9wYVlY/0YIHwBJZF/uzZ7DYOjJTeqWftSB+omZMBd98eCF6LM9GFmDan2AsV dqWuZUNAed+A== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2020 20:31:30 -0700 IronPort-SDR: S6B/qUQ+vIiefNha3AJ1ouG+Tjt45HCiTtBtjVyq0hqvzL5nKP9Q6RHUk4T6+OqyqV9ksPMg0L jBnpuCZfvjiA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,393,1580803200"; d="scan'208";a="333066516" X-Received: from aedesimo-desk.amr.corp.intel.com ([10.7.159.171]) by orsmga001.jf.intel.com with ESMTP; 16 Apr 2020 20:31:30 -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 2/6] EdkRepo: Add new sections to edkrepo.cfg Date: Thu, 16 Apr 2020 20:31:19 -0700 Message-Id: <20200417033123.34972-3-ashley.e.desimone@intel.com> In-Reply-To: <20200417033123.34972-1-ashley.e.desimone@intel.com> References: <20200417033123.34972-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: brwPupWsKxN2IydVJen6nyGxx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1587094292; bh=wXdPiZwXwpVyTL6aUD0KWRX1dZU9p0opS1ZCVX0Spo4=; h=Cc:Date:From:Reply-To:Subject:To; b=nsi9/zwAIBmpJu4Vk4E9LEOFuOZmH+M0BC6uRRpcQWFqrY4OEwjPREkHI8VYSGfAxAs KIYIdWBkEafNMCzzGFXgR5IaALmy8u/p93NfNRtpJzNS0jABCbIe8FdoZgd3f8Fr5W4gK uMEssphCO705WnSGtY+0RIe6nWaXM47tjg8= 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 --- 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 (#57487): https://edk2.groups.io/g/devel/message/57487 Mute This Topic: https://groups.io/mt/73070619/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 May 4 08:08:25 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+57489+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+57489+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1587094293; cv=none; d=zohomail.com; s=zohoarc; b=Yztz2N2SnRIWJQN0WY5MqICiz6ISLvYQB/oR4/K6U8phwpaJg+804z3xvJBBPf11nY6kQlm3IvrAxCAOLQqwNhungr9PwgHPesOmeqBJhxj7n1aEhqj7If+BqTyQGBtytingdqY2oOZ+QziJ7WUeA4Jl7HPLKBNG+GkWnOXt/lg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587094293; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=yFKfO6IPtU/NXg8341jdvZPm5LbJ/r9OOkDV/+BRad0=; b=K77LHSZoliU7R8LXuemFLIDRLRLx31o4F+JFoIDqddToJu9sASM1Y4rqpIU7QJvXnu+8k5ki/VmK7ZUeYd6JDjZO9iVJzmZj+mEWxueCj1r5dt7VndnBmqZX6jVYHR7+xIIlQCF+peFQEVAowducNMNEpjqXw//v1HAivXp7UXE= 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+57489+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 1587094293139766.7064048987422; Thu, 16 Apr 2020 20:31:33 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id QHvLYY1788612x5GqnDrRBRx; Thu, 16 Apr 2020 20:31:32 -0700 X-Received: from mga14.intel.com (mga14.intel.com []) by mx.groups.io with SMTP id smtpd.web10.3734.1587094291266785285 for ; Thu, 16 Apr 2020 20:31:31 -0700 IronPort-SDR: UQu79APjvehIPW4ep4mf3ycWJQgS+qOTbOIzk13u1Wu1RXug9QXH1JbbcKzB1Pa7nA+1g+m8qt BZrZAuxxzESQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2020 20:31:30 -0700 IronPort-SDR: CsTDe84WTAQ/QYzqCg7/PAAoxDm8bZuiUW1kXVSyJSs0jTdyY4qFMGk9qf5oMSVY5BPvdUkiOJ gt7XE/jEF3Xw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,393,1580803200"; d="scan'208";a="333066521" X-Received: from aedesimo-desk.amr.corp.intel.com ([10.7.159.171]) by orsmga001.jf.intel.com with ESMTP; 16 Apr 2020 20:31:30 -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 3/6] EdkRepo: Add the manifest_repo_list property to BaseConfig Date: Thu, 16 Apr 2020 20:31:20 -0700 Message-Id: <20200417033123.34972-4-ashley.e.desimone@intel.com> In-Reply-To: <20200417033123.34972-1-ashley.e.desimone@intel.com> References: <20200417033123.34972-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: 6ujjqPZGJePjrA63pQqaf1atx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1587094292; bh=ovk+Qt9oc2d6huXpSOe41Vhp7B7fo8bxL8FnqO5qo/0=; h=Cc:Date:From:Reply-To:Subject:To; b=bekf7lVhKc8Am8hhGiVBSdXNU2olzyNCnIp55zHtUf/Mbtu50cHomANPsQWDv1ujBFQ hIU9dooIRYgW2ie3VWLCua/2kTKjed1f1X9II8weEvokOdPL39XbN4XraAIyLMeyoLmPk zxjcygcVC7JhB3CAkqRIo7hIKYKF8qJK0xM= 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 --- 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 (#57489): https://edk2.groups.io/g/devel/message/57489 Mute This Topic: https://groups.io/mt/73070621/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 May 4 08:08:25 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+57490+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+57490+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1587094293; cv=none; d=zohomail.com; s=zohoarc; b=N0wNz4Y3ZZZQWHWT3AkXC8z8sv4BTqcWfD4KQr1w88y4+RbM0rbIBWO9+HMQekGKgZ3NDGliKWQS6uZF6diiDSzjhkt/Lwc3rJtmbgtGxD+4zkFomIhfc6nhRyRrxZsKs6izsNt5ELgblCa4sg9iIKrb8/+fyse72kjexvzzB/U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587094293; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=RupyVmK3rGTlh4k+RkNW/ATNNJqy3ey3zLJ5ZiAdy7w=; b=ClXx2IzmSWdMMi7D+VP+y5Yw9WjDU1o8zKYE+gS54Uj0D7DUitC0PMT7LEetMpebIz95wN1O7ZkOGjsY/4scdI8a4W2dg3IunoxqajTjkNslbmRWXSuKeNEOKMh5R3GnqdrxkFGZ6MPX+AMZhLID8527E3pw2EdkDLAyVENOr0Y= 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+57490+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 1587094293165110.45970568907921; Thu, 16 Apr 2020 20:31:33 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id LZCIYY1788612xcdkVzkZn1M; Thu, 16 Apr 2020 20:31:32 -0700 X-Received: from mga14.intel.com (mga14.intel.com []) by mx.groups.io with SMTP id smtpd.web10.3735.1587094291698496893 for ; Thu, 16 Apr 2020 20:31:32 -0700 IronPort-SDR: LTk3MsGDCJ8IavQXZjt6J3aKUuXXSeggmWUuQNXNGoEfRFyhW+GhZ+QWi9LGyfTqjH/6/pMXon EQ/oMXoT3wJQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2020 20:31:30 -0700 IronPort-SDR: Y7vDxJ534qKz2YZJD8P6k5/6NkQpZZX05Hzwd7+krKCd6xhiFDpSEuo3KgVorG3Fu7M9amhuRX JLjvLBXVF1vQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,393,1580803200"; d="scan'208";a="333066524" X-Received: from aedesimo-desk.amr.corp.intel.com ([10.7.159.171]) by orsmga001.jf.intel.com with ESMTP; 16 Apr 2020 20:31:30 -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 4/6] EdkRepo: Add manifest_repo_props() Date: Thu, 16 Apr 2020 20:31:21 -0700 Message-Id: <20200417033123.34972-5-ashley.e.desimone@intel.com> In-Reply-To: <20200417033123.34972-1-ashley.e.desimone@intel.com> References: <20200417033123.34972-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: uZhZADHvh2msvc9uqBjlLl2sx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1587094292; bh=wAZ1NnvX06DwKr/IWRJkqNKsUtx9JsWHQJh1rSY355Q=; h=Cc:Date:From:Reply-To:Subject:To; b=ANdAoWclbBD92VLaHcMVSJz0Ds2MvcxgoJT93/vQU+nrXgEse8Wkyyln1UwhR1RiEL9 vdsBLN22UawbIE+KFky0WMrFHmByGSEgg5iWxbJ3IW2K+ySSnHc2wGoufmJAJYVoG2KIv xV3SY5UUOKZV6XPDG/pTZV9HHnsa+33Y/C0= 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 --- edkrepo/config/config_factory.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/edkrepo/config/config_factory.py b/edkrepo/config/config_facto= ry.py index 6f89589..e053f8b 100644 --- a/edkrepo/config/config_factory.py +++ b/edkrepo/config/config_factory.py @@ -118,6 +118,17 @@ 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 + """ + repo_props =3D [] + for prop in self.prop_list: + if manifest_repo in prop.name: + repo_props.append(prop) + return repo_props =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 (#57490): https://edk2.groups.io/g/devel/message/57490 Mute This Topic: https://groups.io/mt/73070622/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 May 4 08:08:25 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+57491+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+57491+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1587094293; cv=none; d=zohomail.com; s=zohoarc; b=if+90tw4vIzpyZipZjLtOzU+sqGVWbvTULcQcEBuo3JdCLx0FhrIsGhYzMEpBqfJNPzU4IvOzDSfi8DTfS75fSeByQxEOfynu5szAs4xCyK3e0CGT0NarzORpJdOeHKZnpJ3AJNPxK0b741fiRcZMCE6NW6sv6AUzuoPkATS0YI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587094293; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=2ypl7/YJQq8DjB0WokdxRW00CQpteaCbSxPyIn1k248=; b=J2q9KmbOZrhLhYAzkGKNM3mTfATAzBkgvwRPWD0sOaVJYzK2A2qmDF+9vCsnHj3SqkTLRkax1ANan5sQopPNxh5MhADylEcO/Vbu5dJ22Tvbm5UTffnJV9nBXjY3eq0dxpNLu1TgWC/c4aY8hJRoi9stnM2uIG67d/xBye+pRXE= 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+57491+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 1587094293956834.5218830512441; Thu, 16 Apr 2020 20:31:33 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id r88HYY1788612xWK4Sx4Fz4J; Thu, 16 Apr 2020 20:31:33 -0700 X-Received: from mga14.intel.com (mga14.intel.com []) by mx.groups.io with SMTP id smtpd.web10.3734.1587094291266785285 for ; Thu, 16 Apr 2020 20:31:32 -0700 IronPort-SDR: lhgs69xWDyz7tvY8FFSCioC88jilvNeAds49Hn/gR/g4zFLDLOkN3S6GpMCTQbRfLNIvthfg7t owyUEv7hmsYA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2020 20:31:31 -0700 IronPort-SDR: 45y4O9hmzb8ssOwZNJrN3LmBUeAPrPYI2MH+qN+Tpy7Bug1bra040a1fKVaUjMN60OowY77tYj tUVJkvbLH2Tg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,393,1580803200"; d="scan'208";a="333066527" X-Received: from aedesimo-desk.amr.corp.intel.com ([10.7.159.171]) by orsmga001.jf.intel.com with ESMTP; 16 Apr 2020 20:31:30 -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 5/6] EdkRepo: Move edkrepo_global_data directory to BaseConfig Date: Thu, 16 Apr 2020 20:31:22 -0700 Message-Id: <20200417033123.34972-6-ashley.e.desimone@intel.com> In-Reply-To: <20200417033123.34972-1-ashley.e.desimone@intel.com> References: <20200417033123.34972-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: 08ekOUAvWs7rWHOzWyliCNlxx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1587094293; bh=DZuI7W8oqBg3gTsxGhBJm2641A/3ynbfQn1rjjC/2Ec=; h=Cc:Date:From:Reply-To:Subject:To; b=oEJzHyKohxXVhoO8V6coipcas0K8IMOWvOIuTuOM3Ey6kNmNrWktpcygDdXeO4WB4vj 8VWYs/+elsWwABsF96XZxFWl7fuWvTLkbEfX3Ew/JmeXTPN2/Cje+pRZfa37PgYn0IOOI ORJclrKwJy8wNtgJfKRmo912bCZoh8hg8Y4= 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 --- 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 e053f8b..a4daba3 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) @@ -136,8 +137,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), @@ -152,7 +152,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): @@ -169,7 +169,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): @@ -196,7 +196,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 (#57491): https://edk2.groups.io/g/devel/message/57491 Mute This Topic: https://groups.io/mt/73070623/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 May 4 08:08:25 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+57492+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+57492+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1587094294; cv=none; d=zohomail.com; s=zohoarc; b=dM2DF9wxxglSCM8wrkOXsnCsTbcOQzix44UEX/FheWjKPPS5J6O2132bro+KInyz5i+JeQYvwnPpqfq8FOVMGyJ4WIBN2/15igzMv5cPiJopp4Ef2ULWZ7EFBe2sTedCV55imgWA3lzvSBGh89FDHHkZdSy+U7E7die9d/25IgY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587094294; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=zGBemut8Yi4cGwIFCSliK7L1nfq/M88C8XDbnI04Pcc=; b=fz+bsy3LU31WqhqTe9rs0FmC8QGDuCcBJNBwmLFEMUNFsNheUu6+vALKaK4WwQmCoz+nPkhux6IM/YWNYPBLZOyiC3hMBWIm2Q5jW3kn6cevbQgr9lAJBUT0TTR4oGmmGkhS2oPAFp58+eRcShcK/396FM0BQD1YeCo7S02YIDA= 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+57492+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 1587094294030759.6404908082484; Thu, 16 Apr 2020 20:31:34 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id zBrXYY1788612x0XjWKihr3u; Thu, 16 Apr 2020 20:31:33 -0700 X-Received: from mga14.intel.com (mga14.intel.com []) by mx.groups.io with SMTP id smtpd.web10.3735.1587094291698496893 for ; Thu, 16 Apr 2020 20:31:32 -0700 IronPort-SDR: pv6j/gkgNmq19KaPozIMQFRAQLLXqPdTi9se6KcFawOEiiR3+X7FEkUvcPMl2j44FoO23q9dGv hl9tFf3b3Nog== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2020 20:31:31 -0700 IronPort-SDR: mKYTuTMEFnjLAAE6fYBuIT536Jhtqol0xWmePJ3dX4DUPYDqKiS5FJ4QUU20FN1v9rXz7ft/pz g75qblKGDqZQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,393,1580803200"; d="scan'208";a="333066529" X-Received: from aedesimo-desk.amr.corp.intel.com ([10.7.159.171]) by orsmga001.jf.intel.com with ESMTP; 16 Apr 2020 20:31:30 -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 6/6] EdkRepo: Add 'get' functions for Manifest Repo data Date: Thu, 16 Apr 2020 20:31:23 -0700 Message-Id: <20200417033123.34972-7-ashley.e.desimone@intel.com> In-Reply-To: <20200417033123.34972-1-ashley.e.desimone@intel.com> References: <20200417033123.34972-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: 4b7rgGnywBplHEx6bRTOhlAnx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1587094293; bh=lMaO6opsXaMvdB10crFAhbh/SpoQk7h6tbwZ+5trOV4=; h=Cc:Date:From:Reply-To:Subject:To; b=INIJEvddHD15R/J5z8vLQb3bCFUHTrU7XU1MxzMrOIudSRgJ0U8GJPD10+DS3xvy7ca DBwc6W6ORUBt8APCPD1lK3X3YliTUeQ4PUe//Uqqb+ozhCK50pJ3XNeJQOfDvpJP3sriy h6xLtn4OkeOqigw+OYa0KY1CVWWdm1HGrBE= 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 --- 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 a4daba3..022e0bb 100644 --- a/edkrepo/config/config_factory.py +++ b/edkrepo/config/config_factory.py @@ -131,6 +131,43 @@ class BaseConfig(): repo_props.append(prop) return repo_props =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 (#57492): https://edk2.groups.io/g/devel/message/57492 Mute This Topic: https://groups.io/mt/73070624/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-