Re: [Qemu-devel] [PATCH] softfloat: rebase to version 2a

[Aurelien Jarno <aurelien@aurel32.net>]

On Mon, Apr 29, 2013 at 01:05:03PM -0500, Anthony Liguori wrote:
> N.B. If you are on CC, see after the '---' for a requested action!
> 
> The license of SoftFloat-2b is claimed to be GPLv2 incompatible by
> the FSF due to an indemnification clause.  The previous release,
> SoftFloat-2a, did not contain this clause.  The only changes between
> these two versions as far as QEMU is concerned is the license change
> and a global modification of the comment structure.  This patch rebases
> our softfloat code to SoftFloat-2a in order to have a GPLv2 compatible
> license.

Thanks for your work!

> Please note, this is a comment-only change.  The resulting binary should
> be the same.
> 
> I created this patch using the following strategy:
> 
> 1) Create a branch using the original import of softfloat code:
>    $ git checkout 158142c2c2df728cfa3b5320c65534921a764f26
> 
> 2) Remove carriage returns from Softfloat-2b
> 
> 3) Compare each of the softfloat files against Softfloat-2b using the
>    following mapping to generate Fabrice's original softfloat changes:
> 
>    - fpu/softfloat.c -> softfloat/bits64/softfloat.c
>    - fpu/softfloat.h -> softfloat/bits64/386-Win32-gcc/softfloat.h
>    - fpu/softfloat-macros.h -> softfloat/bits64/softfloat-macros
>    - fpu/softfloat-specialize.h -> softfloat/bits64/386-Win32-gcc/softfloat-specialize
> 
> 4) Replace our softfloat files with the corresponding files from Softfloat-2a
> 
> 5) Apply the diffs from (3) to (4) and commit
> 
> 6) Create a diff between (5) and 158142c2c2df728cfa3b5320c65534921a764f26
>    - This diff consists 100% of licensing change + comment reformating
> 
> 7) Checkout the latest master branch, apply the diff from (6)
>    - There were a lot of comment rejects, confirmed this was only comments
>      and then used an emacs macro to rewrite the comments to the Softfloat-2a
>      form.

I guess this last step is the reason why comments added long after the
original code are also modified by your patch. Right?

> Cc: Andreas Färber <afaerber@suse.de>
> Cc: Aurelien Jarno <aurelien@aurel32.net>
> Cc: Avi Kivity <avi.kivity@gmail.com>
> Cc: Ben Taylor <bentaylor.solx86@gmail.com>
> Cc: Blue Swirl <blauwirbel@gmail.com>
> Cc: Christophe Lyon <christophe.lyon@st.com>
> Cc: Fabrice Bellard <fabrice@bellard.org>
> Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
> Cc: Jocelyn Mayer <l_indien@magic.fr>
> Cc: Juan Quintela <quintela@redhat.com>
> Cc: malc <av1474@comtv.ru>
> Cc: Max Filippov <jcmvbkbc@gmail.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Paul Brook <paul@codesourcery.com>
> Cc: Peter Maydell <peter.maydell@linaro.org>
> Cc: Richard Henderson <rth@twiddle.net>
> Cc: Richard Sandiford <rdsandiford@googlemail.com>
> Cc: Stefan Weil <weil@mail.berlios.de>
> Cc: Thiemo Seufer <ths@networkno.de>
> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
> ---
> In order to make this change, we need to relicense all contributions
> from initial import of the SoftFloat code to match the license of
> SoftFloat-2a (instead of the implied SoftFloat-2b license).
> 
> If you are on CC, it is because you have contributed to the softfloat
> code in QEMU.  Please response to this note with:
> 
> Acked-by: Your Name <your@email.com>
> 
> To significant that you are able and willing to relicense your changes
> to the SoftFloat-1a license (or a GPL compatible license).
> 
> Please respond no later than May 6th, 2013.  If we are unable to confirm
> relicense from an author, changes from that author will be reverted.

Acked-by: Aurelien Jarno <aurelien@aurel32.net>

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net