qt5: fix license information for qt5multimedia and qt5xmlpatterns
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Fri, 10 Apr 2015 09:13:24 +0000 (11:13 +0200)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Fri, 10 Apr 2015 19:52:41 +0000 (21:52 +0200)
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>
Reviewed-by: Bernd Kuhls <bernd.kuhls@t-online.de>
package/qt5/qt5multimedia/qt5multimedia.mk
package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk

index 0c8d2ec83ca08dd3f79858f1559ad02494b0de20..763fc28603d865c1301fda239364130cb58df48f 100644 (file)
@@ -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
index b69cac78fc83eacd7ec5b67f430caaaff63cd775..136da9f1997596d46c56ca31a75ca895aabc967a 100644 (file)
@@ -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