diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-09-06 11:09:04 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-09-06 08:14:08 +0000 |
| commit | d7ec9f35aa328625fd468d6b9adca67f0819e026 (patch) | |
| tree | b63009fe23266006449994b4fce78e1b860227bc /meta-fsl-extras | |
| parent | bc3ff116329d08c63288af8e581a8cd23230c0a9 (diff) | |
| parent | c3d680bf64c4747b22af526acbf121c1ee6044e6 (diff) | |
Merge remote-tracking branch 'origin/sumo' into thud
License related change from commit "df96751 Whitelist path for Qt license"
adapted for qtsaferenderer_git.bb recipe.
* origin/sumo:
c3d680b meta-qt5: update layer
47b1e2d meta-qt5: update layer
df96751 Whitelist path for Qt license
e6d9567 meta-qt5: update layer
af511a9 boot2qt-demos: use qt5-git.inc
306683b qtdeviceutilities: update to latest revision
7170c0e qtquicktimeline: update to v1.0.0
Conflicts:
meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo.inc
meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
meta-boot2qt/recipes-qt/qt5/qtquicktimeline_git.bb
scripts/manifest.xml
Change-Id: Ib8edb2364a7a41e0046ded370626acd953e48dde
Diffstat (limited to 'meta-fsl-extras')
| -rw-r--r-- | meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex.bb b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex.bb index ff25ec51..464c1fb4 100644 --- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex.bb +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex.bb @@ -28,7 +28,7 @@ ############################################################################ LICENSE = "The-Qt-Company-Commercial" -LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625" +LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=948f8877345cd66106f11031977a4625" DEPENDS = "u-boot-mkimage-native" PV = "2.8b3" |