deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

qt5webengine: use QT5WEBENGINE prefix for CHROMIUM_LICENSE_FILES variable

Browse source 
The qt5webengine package currently uses the CHROMIUM_LICENSE_FILES
variable to hold the list of license files for the chromium source
code embedded inside the qt5webengine code.

However, using this variable would clash with a hypothetical
"chromium" package, and anyway violates our rule that all variables of
a package should be prefixed by the package name.

This commit fixes that by adding the QT5WEBENGINE to this variable.

Signed-off-by: Laurent Hartanerot <laurent.hartanerot@atos.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Laurent Hartanerot 2018-08-30 12:07:03 +02:00 committed by Thomas Petazzoni
parent beb2b891ec
commit 1098f64d7b
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/qt5/qt5webengine/chromium-latest.inc
View file

@ -1,4 +1,4 @@
CHROMIUM_LICENSE_FILES = \
QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \
src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \
src/3rdparty/chromium/tools/symsrc/COPYING-pefile \
src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \

2
package/qt5/qt5webengine/chromium-lts.inc
View file

@ -1,4 +1,4 @@
CHROMIUM_LICENSE_FILES = \
QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \
src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \
src/3rdparty/chromium/sdch/open-vcdiff/COPYING \
src/3rdparty/chromium/tools/gyp/LICENSE \

2
package/qt5/qt5webengine/qt5webengine.mk
View file

@ -19,7 +19,7 @@ include package/qt5/qt5webengine/chromium-lts.inc
endif
QT5WEBENGINE_LICENSE = GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception
QT5WEBENGINE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT \
LICENSE.GPLv3 LICENSE.LGPL3 $(CHROMIUM_LICENSE_FILES)
LICENSE.GPLv3 LICENSE.LGPL3 $(QT5WEBENGINE_CHROMIUM_LICENSE_FILES)
ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
QT5WEBENGINE_DEPENDENCIES += xlib_libXScrnSaver xlib_libXcomposite \