summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2017-04-23 22:31:01 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-04-29 15:53:33 +0200
commitc5342ea6adbb3fddb7f898d855ef11a4bf7899ff (patch)
treea05fa3de59b94ce30b288f092ef17142add034f2
parent6e070e79afff1535a3fe552605e4baaccebaf7ac (diff)
downloadbuildroot-c5342ea6adbb3fddb7f898d855ef11a4bf7899ff.tar.gz
buildroot-c5342ea6adbb3fddb7f898d855ef11a4bf7899ff.zip
package/qt5multimedia: always use the opensource license
We never ask the user to confirm their assent about the use of a free license; there is no reason we do so for Qt. The output of legal-info is there to gather all the licenses used in a build; the license for qt5multimedia will be there to be consulted as well. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Julien Corjon <corjon.j@ecagroup.com> Cc: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/qt5/qt5multimedia/qt5multimedia.mk5
1 files changed, 0 insertions, 5 deletions
diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index e66ce40851..133536e1ab 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -10,7 +10,6 @@ QT5MULTIMEDIA_SOURCE = qtmultimedia-opensource-src-$(QT5MULTIMEDIA_VERSION).tar.
QT5MULTIMEDIA_DEPENDENCIES = qt5base
QT5MULTIMEDIA_INSTALL_STAGING = YES
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
@@ -18,10 +17,6 @@ else
QT5MULTIMEDIA_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
-else
-QT5MULTIMEDIA_LICENSE = Commercial license
-QT5MULTIMEDIA_REDISTRIBUTE = NO
-endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y)
QT5MULTIMEDIA_DEPENDENCIES += gst1-plugins-base
OpenPOWER on IntegriCloud