From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50983) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gVJBO-0003L9-8n for qemu-devel@nongnu.org; Fri, 07 Dec 2018 11:40:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gVJBN-0001jM-31 for qemu-devel@nongnu.org; Fri, 07 Dec 2018 11:40:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47050) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gVJBM-0001hG-PZ for qemu-devel@nongnu.org; Fri, 07 Dec 2018 11:40:52 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2CF6B307D981 for ; Fri, 7 Dec 2018 16:40:52 +0000 (UTC) References: <20181207151636.8123-1-berrange@redhat.com> From: Eric Blake Message-ID: Date: Fri, 7 Dec 2018 10:40:50 -0600 MIME-Version: 1.0 In-Reply-To: <20181207151636.8123-1-berrange@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [qemu-web PATCH] Add license files for GPLv2+ and CC-BY-SA-4.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?Q?Daniel_P=2e_Berrang=c3=a9?= , qemu-devel@nongnu.org Cc: Paolo Bonzini , Thomas Huth On 12/7/18 9:16 AM, Daniel P. Berrang=C3=A9 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 >=20 > With git HEAD at d06ee0a788da27a2f24ab46928bc03eea019fb44, we have > authors: >=20 > $ git log | grep Author | sed -e 's/Author: //' | sort | uniq -c You're reinventing: $ git shortlog -e -s > 1 Alex Benn=C3=A9e > 2 Daniel P. Berrange > 3 Daniel P. Berrang=C3=A9 Looks like a separate patch introducing .mailmap is in order :) > 3 Eric Blake > 1 Fam Zheng > 2 Jeff Cody > 50 Michael Roth > 47 Paolo Bonzini > 1 Rainer M=C3=BCller > 1 Stefan Hajnoczi > 14 Thomas Huth > 1 Yu Ning >=20 > 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 > qemu-devel@nongnu.org mailing list with the following Message-IDs: >=20 > - Alex Benn=C3=A9e >=20 > >=20 > - Michael Roth >=20 > <154411651930.28165.5754119001430373065@sif> >=20 > - Rainer M=C3=BCller >=20 > >=20 > - Yu Ning >=20 > >=20 > 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. >=20 > Signed-off-by: Daniel P. Berrang=C3=A9 > --- > +++ b/_includes/copyright.html > @@ -1,8 +1,7 @@ >
>
> -
> - Design: TEMPLATED — > - available under CC-BY 3.0 > -
> +
> + This site is made available under the terms of a number of licenses. Does Jekyll auto-create a /license file from the various LICENSE-*=20 additions, or did you forget to 'git add' yet another file? I'm=20 assuming that this _includes/copyright.html is merely a footer appended=20 on each page. Is it worth being specific that the TEMPLATED portion is still=20 CC-BY-3.0, while all other contributions are dual-licensed=20 GPLv2+/CC-BY-SA-4.0? Or, if we don't want that much details in the=20 footer, should README at least mention the distinctions? --=20 Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org