summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2018-09-04 20:42:46 (GMT)
committerPeter Korsgaard <peter@korsgaard.com>2018-09-04 20:45:20 (GMT)
commit6f9e4e637fd4047823cda7f11437e90ff6a3dbb5 (patch)
tree2cb9fedb584676fb5a80b9b419780cc6351a4c98
parentc6caa2dc3baabcfc7fec2c261087b0d292b2c2a4 (diff)
downloadbuildroot-6f9e4e637fd4047823cda7f11437e90ff6a3dbb5.tar.gz
buildroot-6f9e4e637fd4047823cda7f11437e90ff6a3dbb5.tar.bz2
qt5quickcontrols: correct license files for 5.9.x version
Fixes: http://autobuild.buildroot.net/results/9326cb85c8ce4f98aa9d0a1238ffdab3e9829637/ Similar in spirit to commit 83d33f76 (qt5quickcontrols: update license file names for Qt 5.6 version), but on 2018.02.x the list of files was correct for the 5.6 version but not the 5.9 version. Also add hashes for these licese files. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/qt5/qt5quickcontrols/qt5quickcontrols.hash3
-rw-r--r--package/qt5/qt5quickcontrols/qt5quickcontrols.mk5
2 files changed, 8 insertions, 0 deletions
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
index c437073..37ddd00 100644
--- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
@@ -8,4 +8,7 @@ sha256 da4dd353802197c2bb53c92a36cf7749c7d9dc29b4acc919b692683e9c1c3313 qtquick
sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
+sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
index 88e767b..87b8559 100644
--- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
@@ -11,7 +11,12 @@ QT5QUICKCONTROLS_DEPENDENCIES = qt5base qt5declarative
QT5QUICKCONTROLS_INSTALL_STAGING = YES
QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs)
+
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
+QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL
+else
QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
+endif
define QT5QUICKCONTROLS_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)