Re: [Qemu-devel] [qemu-web PATCH] Add license files for GPLv2+ and CC-BY-SA-4.0

[Daniel P . Berrangé]

On Fri, Dec 07, 2018 at 10:40:50AM -0600, Eric Blake wrote:
> On 12/7/18 9:16 AM, Daniel P. Berrangé wrote:
> > The intent is that from this point onwards, content for this repository
> > is dual-licensed under the GPLv2+ and CC-BY-SA-4.0
> > 
> > With git HEAD at d06ee0a788da27a2f24ab46928bc03eea019fb44, we have
> > authors:
> > 
> >    $ git log | grep Author | sed -e 's/Author: //' | sort | uniq -c
> 
> You're reinventing:
> $ git shortlog -e -s
> 
> >        1 Alex Bennée <address@hidden>
> >        2 Daniel P. Berrange <address@hidden>
> >        3 Daniel P. Berrangé <address@hidden>
> 
> Looks like a separate patch introducing .mailmap is in order :)
> 
> >        3 Eric Blake <address@hidden>
> >        1 Fam Zheng <address@hidden>
> >        2 Jeff Cody <address@hidden>
> >       50 Michael Roth <address@hidden>
> >       47 Paolo Bonzini <address@hidden>
> >        1 Rainer Müller <address@hidden>
> >        1 Stefan Hajnoczi <address@hidden>
> >       14 Thomas Huth <address@hidden>
> >        1 Yu Ning <address@hidden>
> > 
> > This patch constitutes approval for all Red Hat copyright content (all
> > @redhat.com addrs & Stefan Hajnoczi) to be placed under these licenses.
> > For non-Red Hat copyright holders approval was given on the
> > address@hidden mailing list with the following Message-IDs:
> > 
> >   - Alex Bennée <address@hidden>
> > 
> >     <address@hidden>
> > 
> >   - Michael Roth <address@hidden>
> > 
> >     <address@hidden>
> > 
> >   - Rainer Müller <address@hidden>
> > 
> >     <address@hidden>
> > 
> >   - Yu Ning <address@hidden>
> > 
> >     <address@hidden>
> > 
> > Note core basic site template/layout design is derived from a pre-built
> > template already under the CC-by-3.0 license, and will not change.
> > 
> > Signed-off-by: Daniel P. Berrangé <address@hidden>
> > ---
> 
> > +++ b/_includes/copyright.html
> > @@ -1,8 +1,7 @@
> >   <div id="copyright">
> >     <div id="copyright-inner">
> > -   <div class="container">
> > -           Design: <a href="http://templated.co";>TEMPLATED</a> &mdash;
> > -           available under CC-BY 3.0
> > -   </div>
> > +     <div class="container">
> > +       This site is made available under the terms of <a href="/license">a 
> > number of licenses</a>.
> 
> Does Jekyll auto-create a /license file from the various LICENSE-*
> additions, or did you forget to 'git add' yet another file?  I'm assuming
> that this _includes/copyright.html is merely a footer appended on each page.

Doh, yes, I missed a file.

> Is it worth being specific that the TEMPLATED portion is still CC-BY-3.0,
> while all other contributions are dual-licensed GPLv2+/CC-BY-SA-4.0?  Or, if
> we don't want that much details in the footer, should README at least
> mention the distinctions?

That's what the missing file does indeed do :-)

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|