From: Yann E. MORIN Date: Sun, 23 Apr 2017 20:31:00 +0000 (+0200) Subject: package/qt5location: always use the opensource license X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6e070e79afff1535a3fe552605e4baaccebaf7ac;p=buildroot.git package/qt5location: 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 qt5location will be there to be consulted as well. Signed-off-by: "Yann E. MORIN" Cc: Julien Corjon Cc: Peter Seiderer Signed-off-by: Thomas Petazzoni --- diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index 96263e89b9..b31bee7d17 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -10,7 +10,6 @@ QT5LOCATION_SOURCE = qtlocation-opensource-src-$(QT5LOCATION_VERSION).tar.xz QT5LOCATION_DEPENDENCIES = qt5base QT5LOCATION_INSTALL_STAGING = YES -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL @@ -18,10 +17,6 @@ else QT5LOCATION_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL endif -else -QT5LOCATION_LICENSE = Commercial license -QT5LOCATION_REDISTRIBUTE = NO -endif ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5LOCATION_DEPENDENCIES += qt5declarative