From a16e8bd7bdb09ba9affaec7098d772999848ede3 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 23 Apr 2017 22:31:13 +0200 Subject: [PATCH] package/qt5x11extras: 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 qt5x11extras 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/qt5x11extras/qt5x11extras.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index 7dc371cbac..00667c72f3 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -10,7 +10,6 @@ QT5X11EXTRAS_SOURCE = qtx11extras-opensource-src-$(QT5X11EXTRAS_VERSION).tar.xz QT5X11EXTRAS_DEPENDENCIES = qt5base QT5X11EXTRAS_INSTALL_STAGING = YES -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL @@ -18,10 +17,6 @@ else QT5X11EXTRAS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL endif -else -QT5X11EXTRAS_LICENSE = Commercial license -QT5X11EXTRAS_REDISTRIBUTE = NO -endif define QT5X11EXTRAS_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) -- 2.30.2