On Wed, Jun 24, 2015 at 4:23 AM, Olivier Martin <olivier.mar...@arm.com> wrote: > I think your change should be integrated to a new top file > 'Contributions.txt' and all the package 'Contributions.txt' should refer to > this file. > Otherwise we will start to get some inconsistencies between > 'Contributions.txt'.
edk2$ find . -name Contributions.txt | wc -l 38 Ouch! (At least they are all identical.) I found the MdePackage instance (google brought me there), and didn't look to see if there were more.... These should definitely be replaced with a single top-level instance. Any modules that require different content can add a specialized one, but since they are all identical, that is a current requirement. Once the content of changes is agreed upon, I'll update my patch to do this as well. Roy > > -----Original Message----- > From: Roy Franz [mailto:roy.fr...@linaro.org] > Sent: 23 June 2015 19:36 > To: edk2-devel@lists.sourceforge.net; ler...@redhat.com; > michael.d.kin...@intel.com > Subject: [edk2] [PATCH] MdePkg: Describe submission of a patch authored by > someone else > > Add a description of how to describe the authorship of a patch that is > submitted by someone other than the original author. > Add mention of git format-patch --stat=120 option for generating more useful > patch names in diffstat. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Roy Franz <roy.fr...@linaro.org> > --- > MdePkg/Contributions.txt | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/MdePkg/Contributions.txt b/MdePkg/Contributions.txt index > f87cbd7..98de958 100644 > --- a/MdePkg/Contributions.txt > +++ b/MdePkg/Contributions.txt > @@ -67,7 +67,16 @@ Patch content inline or attached > * The first line of commit message is taken from the email's subject > line following [PATCH]. The remaining portion of the commit message > is the email's content until the '---' line. > -* git format-patch is one way to create this format > +* git format-patch is one way to create this format. In order to get > + useful path names in the diffstat, the "--stat=120" option should > + be used. > +* If a patch is being submitted by someone other than the orginal > + author, then the orginal author's Signed-off-by/Contributed-under > +lines > + should be first, followed by the Signed-off-by/Contributed-under > +lines > + of the patch submitter. Any changes made by the submitter should be > + noted above the submitter's Signed-off-by line. If git is being used > + to prepare the patches, the git author of the commit corresponding to > + the patch should be owned by the original author (git commit --author). > > === Definitions for sample patch email === > > -- > 2.1.4 > > > ------------------------------------------------------------------------------ > Monitor 25 network devices or servers for free with OpManager! > OpManager is web-based network management software that monitors > network devices and physical & virtual servers, alerts via email & sms > for fault. Monitor 25 devices for free with no restriction. Download now > http://ad.doubleclick.net/ddm/clk/292181274;119417398;o > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/edk2-devel > > > -- IMPORTANT NOTICE: The contents of this email and any attachments are > confidential and may also be privileged. If you are not the intended > recipient, please notify the sender immediately and do not disclose the > contents to any other person, use it for any purpose, or store or copy the > information in any medium. Thank you. > > ARM Limited, Registered office 110 Fulbourn Road, Cambridge CB1 9NJ, > Registered in England & Wales, Company No: 2557590 > ARM Holdings plc, Registered office 110 Fulbourn Road, Cambridge CB1 9NJ, > Registered in England & Wales, Company No: 2548782 > > > ------------------------------------------------------------------------------ > Monitor 25 network devices or servers for free with OpManager! > OpManager is web-based network management software that monitors > network devices and physical & virtual servers, alerts via email & sms > for fault. Monitor 25 devices for free with no restriction. Download now > http://ad.doubleclick.net/ddm/clk/292181274;119417398;o > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/edk2-devel ------------------------------------------------------------------------------ Monitor 25 network devices or servers for free with OpManager! OpManager is web-based network management software that monitors network devices and physical & virtual servers, alerts via email & sms for fault. Monitor 25 devices for free with no restriction. Download now http://ad.doubleclick.net/ddm/clk/292181274;119417398;o _______________________________________________ edk2-devel mailing list edk2-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/edk2-devel
