diff mbox

qt5: fix license information for qt5multimedia and qt5xmlpatterns

Message ID 1428657204-25558-1-git-send-email-thomas.petazzoni@free-electrons.com
State Accepted
Headers show

Commit Message

Thomas Petazzoni April 10, 2015, 9:13 a.m. UTC
While most of the Qt5 components indeed seem to be under LGPLv2.1 with
exception, or LGPLv3 or GPLv2, the qt5multimedia and qt5xmlpatterns
components only carry the LGPLv2.1 and LGPLv3 license files, and not
the GPLv2 license file. So one can safely assume that the GPLv2 option
is not available for those components, and this commit adjusts the
<pkg>_LICENSE and <pkg>_LICENSE_FILES variables accordingly.

Fixes:

  http://autobuild.buildroot.org/results/c62/c62eef5e5b8add138cdab34e64103d974d0a510b/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/qt5/qt5multimedia/qt5multimedia.mk   | 4 ++--
 package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Comments

Yann E. MORIN April 10, 2015, 5:04 p.m. UTC | #1
Thomas, All,

On 2015-04-10 11:13 +0200, Thomas Petazzoni spake thusly:
> While most of the Qt5 components indeed seem to be under LGPLv2.1 with
> exception, or LGPLv3 or GPLv2, the qt5multimedia and qt5xmlpatterns
> components only carry the LGPLv2.1 and LGPLv3 license files, and not
> the GPLv2 license file. So one can safely assume that the GPLv2 option
> is not available for those components, and this commit adjusts the
> <pkg>_LICENSE and <pkg>_LICENSE_FILES variables accordingly.
> 
> Fixes:
> 
>   http://autobuild.buildroot.org/results/c62/c62eef5e5b8add138cdab34e64103d974d0a510b/
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  package/qt5/qt5multimedia/qt5multimedia.mk   | 4 ++--
>  package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
> index 0c8d2ec..763fc28 100644
> --- a/package/qt5/qt5multimedia/qt5multimedia.mk
> +++ b/package/qt5/qt5multimedia/qt5multimedia.mk
> @@ -11,8 +11,8 @@ QT5MULTIMEDIA_DEPENDENCIES = qt5base
>  QT5MULTIMEDIA_INSTALL_STAGING = YES
>  
>  ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
> -QT5MULTIMEDIA_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
> -QT5MULTIMEDIA_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2
> +QT5MULTIMEDIA_LICENSE = LGPLv2.1 with exception or LGPLv3
> +QT5MULTIMEDIA_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
>  else
>  QT5MULTIMEDIA_LICENSE = Commercial license
>  QT5MULTIMEDIA_REDISTRIBUTE = NO
> diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
> index b69cac7..136da9f 100644
> --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
> +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
> @@ -11,8 +11,8 @@ QT5XMLPATTERNS_DEPENDENCIES = qt5base
>  QT5XMLPATTERNS_INSTALL_STAGING = YES
>  
>  ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
> -QT5XMLPATTERNS_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
> -QT5XMLPATTERNS_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2
> +QT5XMLPATTERNS_LICENSE = LGPLv2.1 with exception or LGPLv3
> +QT5XMLPATTERNS_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
>  else
>  QT5XMLPATTERNS_LICENSE = Commercial license
>  QT5XMLPATTERNS_REDISTRIBUTE = NO
> -- 
> 2.1.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Bernd Kuhls April 10, 2015, 5:25 p.m. UTC | #2
Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote
in
news:1428657204-25558-1-git-send-email-thomas.petazzoni@free-electrons.com:

> While most of the Qt5 components indeed seem to be under LGPLv2.1 with
> exception, or LGPLv3 or GPLv2, the qt5multimedia and qt5xmlpatterns
> components only carry the LGPLv2.1 and LGPLv3 license files, and not
> the GPLv2 license file. So one can safely assume that the GPLv2 option
> is not available for those components, and this commit adjusts the
> <pkg>_LICENSE and <pkg>_LICENSE_FILES variables accordingly.
> 
> Fixes:
> 
>   http://autobuild.buildroot.org/results/c62/c62eef5e5b8add138cdab34e6410
>   3d974d0a510b/ 
> 
> Signed-off-by: Thomas Petazzoni
> <thomas.petazzoni@free-electrons.com> 

Reviewed-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Regards, Bernd
Thomas Petazzoni April 10, 2015, 7:53 p.m. UTC | #3
Hello,

On Fri, 10 Apr 2015 11:13:24 +0200, Thomas Petazzoni wrote:
> While most of the Qt5 components indeed seem to be under LGPLv2.1 with
> exception, or LGPLv3 or GPLv2, the qt5multimedia and qt5xmlpatterns
> components only carry the LGPLv2.1 and LGPLv3 license files, and not
> the GPLv2 license file. So one can safely assume that the GPLv2 option
> is not available for those components, and this commit adjusts the
> <pkg>_LICENSE and <pkg>_LICENSE_FILES variables accordingly.
> 
> Fixes:
> 
>   http://autobuild.buildroot.org/results/c62/c62eef5e5b8add138cdab34e64103d974d0a510b/
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Applied, thanks.

Thomas
diff mbox

Patch

diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index 0c8d2ec..763fc28 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -11,8 +11,8 @@  QT5MULTIMEDIA_DEPENDENCIES = qt5base
 QT5MULTIMEDIA_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5MULTIMEDIA_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
-QT5MULTIMEDIA_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2
+QT5MULTIMEDIA_LICENSE = LGPLv2.1 with exception or LGPLv3
+QT5MULTIMEDIA_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
 else
 QT5MULTIMEDIA_LICENSE = Commercial license
 QT5MULTIMEDIA_REDISTRIBUTE = NO
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
index b69cac7..136da9f 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
@@ -11,8 +11,8 @@  QT5XMLPATTERNS_DEPENDENCIES = qt5base
 QT5XMLPATTERNS_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5XMLPATTERNS_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
-QT5XMLPATTERNS_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2
+QT5XMLPATTERNS_LICENSE = LGPLv2.1 with exception or LGPLv3
+QT5XMLPATTERNS_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
 else
 QT5XMLPATTERNS_LICENSE = Commercial license
 QT5XMLPATTERNS_REDISTRIBUTE = NO