From e4a1a5e91f921623b92f6fabd79e1010bacb2b4e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 23 Apr 2017 22:30:59 +0200 Subject: [PATCH] package/qt5imageformats: 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 qt5imageformats 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 --- package/qt5/qt5imageformats/qt5imageformats.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index 5d31e14a2f..f3d9d7427f 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -10,7 +10,6 @@ QT5IMAGEFORMATS_SOURCE = qtimageformats-opensource-src-$(QT5IMAGEFORMATS_VERSION QT5IMAGEFORMATS_DEPENDENCIES = qt5base QT5IMAGEFORMATS_INSTALL_STAGING = YES -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL @@ -18,10 +17,6 @@ else QT5IMAGEFORMATS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL endif -else -QT5IMAGEFORMATS_LICENSE = Commercial license -QT5IMAGEFORMATS_REDISTRIBUTE = NO -endif define QT5IMAGEFORMATS_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) -- 2.30.2