Am 29.04.2013 20:05, schrieb Anthony Liguori: > 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. > > 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. > > Cc: Andreas Färber <afaer...@suse.de> > Cc: Aurelien Jarno <aurel...@aurel32.net> > Cc: Avi Kivity <avi.kiv...@gmail.com> > Cc: Ben Taylor <bentaylor.sol...@gmail.com> > Cc: Blue Swirl <blauwir...@gmail.com> > Cc: Christophe Lyon <christophe.l...@st.com> > Cc: Fabrice Bellard <fabr...@bellard.org> > Cc: Guan Xuetao <g...@mprc.pku.edu.cn> > Cc: Jocelyn Mayer <l_ind...@magic.fr> > Cc: Juan Quintela <quint...@redhat.com> > Cc: malc <av1...@comtv.ru> > Cc: Max Filippov <jcmvb...@gmail.com> > Cc: Paolo Bonzini <pbonz...@redhat.com> > Cc: Paul Brook <p...@codesourcery.com> > Cc: Peter Maydell <peter.mayd...@linaro.org> > Cc: Richard Henderson <r...@twiddle.net> > Cc: Richard Sandiford <rdsandif...@googlemail.com> > Cc: Stefan Weil <w...@mail.berlios.de> > Cc: Thiemo Seufer <t...@networkno.de> > Signed-off-by: Anthony Liguori <aligu...@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 <y...@email.com> > > To significant that you are able and willing to relicense your changes > to the SoftFloat-1a license (or a GPL compatible license).
Including my pre-SUSE contributions, Acked-by: Andreas Färber <afaer...@suse.de> for changing to SoftFloat-2a license. Thanks for looking into this, Andreas > 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. > --- > For completeness, here is the full listing of contributions: > > Andreas Färber <afaer...@suse.de> > be45f06 Silence softfloat warnings on OpenSolaris > 5aea4c5 softfloat: Replace uint16 type with uint_fast16_t > 94a49d8 softfloat: Replace int16 type with int_fast16_t > c969654 softfloat: Fix mixups of int and int16 > 38641f8 softfloat: Use uint16 consistently > 87b8cc3 softfloat: Resolve type mismatches between declaration and > implementation > 8d725fa softfloat: Prepend QEMU-style header with derivation notice > 9f8d2a0 softfloat: Use uint32 consistently > bb98fe4 softfloat: Drop [s]bits{8, 16, 32, 64} types in favor of > [u]int{8, 16, 32, 64}_t > [snip] -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg