| Message ID | 20190417091022.14167-2-igor.opaniuk@toradex.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v3,1/2] ARM: dts: colibri/apalis: convert to SPDX license tags | expand |
On 17/04/2019 11:10, Igor Opaniuk wrote: > Replace boiler plate licenses texts with the SPDX license > identifiers in Colibri/Apalis DTS files. > > Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com> > --- > > v3: > - Add Marcel's Acked-by tag > - Remove un-needed parentheses in SPDX line > - Replace MIT with GPL-2.0 in tegra124-apalis-emc.dtsi > > v2: > - Address Stefan's comment: replace GPL-2.0+ instead GPL-2.0 > > arch/arm/boot/dts/tegra124-apalis-emc.dtsi | 39 ++------------------- > arch/arm/boot/dts/tegra124-apalis-eval.dts | 40 ++-------------------- > arch/arm/boot/dts/tegra124-apalis.dtsi | 40 ++-------------------- > 3 files changed, 6 insertions(+), 113 deletions(-) > > diff --git a/arch/arm/boot/dts/tegra124-apalis-emc.dtsi b/arch/arm/boot/dts/tegra124-apalis-emc.dtsi > index ca2c3a557895..57d82f54cb44 100644 > --- a/arch/arm/boot/dts/tegra124-apalis-emc.dtsi > +++ b/arch/arm/boot/dts/tegra124-apalis-emc.dtsi > @@ -1,42 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0 OR GPL > /* > - * Copyright 2016 Toradex AG > + * Copyright 2016-2019 Toradex AG > * > - * This file is dual-licensed: you can use it either under the terms > - * of the GPL or the X11 license, at your option. Note that this dual > - * licensing only applies to this file, and not this project as a > - * whole. "under the terms of the GPL or the X11 license" was translated to GPL-2.0 OR GPL ? Why not GPL-2.0 OR X11 like all other files? Regards.
Hi Marc, Frankly I didn't get you question. The license (below the line you mentioned) text says: "This file is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation." which is GPL-2.0. On Wed, Apr 17, 2019 at 11:58 AM Marc Gonzalez <marc.w.gonzalez@free.fr> wrote: > > On 17/04/2019 11:10, Igor Opaniuk wrote: > > > Replace boiler plate licenses texts with the SPDX license > > identifiers in Colibri/Apalis DTS files. > > > > Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com> > > --- > > > > v3: > > - Add Marcel's Acked-by tag > > - Remove un-needed parentheses in SPDX line > > - Replace MIT with GPL-2.0 in tegra124-apalis-emc.dtsi > > > > v2: > > - Address Stefan's comment: replace GPL-2.0+ instead GPL-2.0 > > > > arch/arm/boot/dts/tegra124-apalis-emc.dtsi | 39 ++------------------- > > arch/arm/boot/dts/tegra124-apalis-eval.dts | 40 ++-------------------- > > arch/arm/boot/dts/tegra124-apalis.dtsi | 40 ++-------------------- > > 3 files changed, 6 insertions(+), 113 deletions(-) > > > > diff --git a/arch/arm/boot/dts/tegra124-apalis-emc.dtsi b/arch/arm/boot/dts/tegra124-apalis-emc.dtsi > > index ca2c3a557895..57d82f54cb44 100644 > > --- a/arch/arm/boot/dts/tegra124-apalis-emc.dtsi > > +++ b/arch/arm/boot/dts/tegra124-apalis-emc.dtsi > > @@ -1,42 +1,7 @@ > > +// SPDX-License-Identifier: GPL-2.0 OR GPL > > /* > > - * Copyright 2016 Toradex AG > > + * Copyright 2016-2019 Toradex AG > > * > > - * This file is dual-licensed: you can use it either under the terms > > - * of the GPL or the X11 license, at your option. Note that this dual > > - * licensing only applies to this file, and not this project as a > > - * whole. > > "under the terms of the GPL or the X11 license" > was translated to GPL-2.0 OR GPL ? > > Why not GPL-2.0 OR X11 like all other files? > > Regards.
On 17/04/2019 13:56, Igor Opaniuk wrote: > Frankly I didn't get you question. > > The license (below the line you mentioned) text says: > "This file is free software; you can redistribute it and/or modify it > under the terms of the GNU General Public License version 2 as > published by the Free Software Foundation." > which is GPL-2.0. The patch for arch/arm/boot/dts/tegra124-apalis-emc.dtsi changes "This file is dual-licensed: you can use it either under the terms of the GPL or the X11 license, at your option." to SPDX-License-Identifier: GPL-2.0 OR GPL ^^^^^^^^^^^^^^ The second "GPL" seems to be an error, where X11 should appear, like in the two other files. Or am I misunderstanding? Did you do the changes manually or via a script? Regards.
Yeah, I know, but in the meantime:
* This file is dual-licensed: you can use it either under the terms
* of the GPL or the X11 license, at your option. Note that this dual
* licensing only applies to this file, and not this project as a
* whole.
*
* a) This file is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
^^^^^^^^^^^^^^^^^^^^^^^^^^
* version 2 as published by the Free Software Foundation.
^^^^^^^^^^
*
* This file is distributed in the hope that it will be useful
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
So which one to choose here?
There is a really mess here in the licence texts in some file, and
using scripts for automatic replacement definitely is not a good idea
(at least we should use something like FOSSology to do a proper
licence cleanup first)
On Wed, Apr 17, 2019 at 2:04 PM Marc Gonzalez <marc.w.gonzalez@free.fr> wrote:
>
> On 17/04/2019 13:56, Igor Opaniuk wrote:
>
> > Frankly I didn't get you question.
> >
> > The license (below the line you mentioned) text says:
> > "This file is free software; you can redistribute it and/or modify it
> > under the terms of the GNU General Public License version 2 as
> > published by the Free Software Foundation."
> > which is GPL-2.0.
>
> The patch for arch/arm/boot/dts/tegra124-apalis-emc.dtsi changes
>
> "This file is dual-licensed: you can use it either under the terms
> of the GPL or the X11 license, at your option."
>
> to
>
> SPDX-License-Identifier: GPL-2.0 OR GPL
> ^^^^^^^^^^^^^^
>
>
> The second "GPL" seems to be an error, where X11 should appear,
> like in the two other files. Or am I misunderstanding?
>
> Did you do the changes manually or via a script?
>
> Regards.
NB: it is preferable to avoid top-posting here. On 17/04/2019 14:18, Igor Opaniuk wrote: > Yeah, I know, but in the meantime: > > * This file is dual-licensed: you can use it either under the terms > * of the GPL or the X11 license, at your option. Note that this dual > * licensing only applies to this file, and not this project as a > * whole. > * > * a) This file is free software; you can redistribute it and/or > * modify it under the terms of the GNU General Public License > > ^^^^^^^^^^^^^^^^^^^^^^^^^^ > * version 2 as published by the Free Software Foundation. > ^^^^^^^^^^ > * > * This file is distributed in the hope that it will be useful > * but WITHOUT ANY WARRANTY; without even the implied warranty of > * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > * GNU General Public License for more details. > > So which one to choose here? It seems like we are misunderstanding each other... To put it bluntly: why don't you use // SPDX-License-Identifier: GPL-2.0 OR X11 like in the other two files? => What makes arch/arm/boot/dts/tegra124-apalis-emc.dtsi different?
On Wed, Apr 17, 2019 at 2:27 PM Marc Gonzalez <marc.w.gonzalez@free.fr> wrote: > > NB: it is preferable to avoid top-posting here. > > On 17/04/2019 14:18, Igor Opaniuk wrote: > > > Yeah, I know, but in the meantime: > > > > * This file is dual-licensed: you can use it either under the terms > > * of the GPL or the X11 license, at your option. Note that this dual > > * licensing only applies to this file, and not this project as a > > * whole. > > * > > * a) This file is free software; you can redistribute it and/or > > * modify it under the terms of the GNU General Public License > > > > ^^^^^^^^^^^^^^^^^^^^^^^^^^ > > * version 2 as published by the Free Software Foundation. > > ^^^^^^^^^^ > > * > > * This file is distributed in the hope that it will be useful > > * but WITHOUT ANY WARRANTY; without even the implied warranty of > > * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > * GNU General Public License for more details. > > > > So which one to choose here? > > It seems like we are misunderstanding each other... > > To put it bluntly: why don't you use > > // SPDX-License-Identifier: GPL-2.0 OR X11 > > like in the other two files? > > => What makes arch/arm/boot/dts/tegra124-apalis-emc.dtsi different? Ahhh, Sorry, finally got what you meant :) Will fix, double check everything and send v4. Thanks for pointing this out!
diff --git a/arch/arm/boot/dts/tegra124-apalis-emc.dtsi b/arch/arm/boot/dts/tegra124-apalis-emc.dtsi index ca2c3a557895..57d82f54cb44 100644 --- a/arch/arm/boot/dts/tegra124-apalis-emc.dtsi +++ b/arch/arm/boot/dts/tegra124-apalis-emc.dtsi @@ -1,42 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 OR GPL /* - * Copyright 2016 Toradex AG + * Copyright 2016-2019 Toradex AG * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * This file is distributed in the hope that it will be useful - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ / { diff --git a/arch/arm/boot/dts/tegra124-apalis-eval.dts b/arch/arm/boot/dts/tegra124-apalis-eval.dts index eaee10ef6512..ceb3f6388c7d 100644 --- a/arch/arm/boot/dts/tegra124-apalis-eval.dts +++ b/arch/arm/boot/dts/tegra124-apalis-eval.dts @@ -1,42 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 OR X11 /* - * Copyright 2016-2018 Toradex AG - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * This file is distributed in the hope that it will be useful - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. + * Copyright 2016-2019 Toradex AG */ /dts-v1/; diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi index 13c93cd507d8..fdc8a4c5aab6 100644 --- a/arch/arm/boot/dts/tegra124-apalis.dtsi +++ b/arch/arm/boot/dts/tegra124-apalis.dtsi @@ -1,42 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 OR X11 /* - * Copyright 2016-2018 Toradex AG - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * This file is distributed in the hope that it will be useful - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. + * Copyright 2016-2019 Toradex AG */ #include "tegra124.dtsi"