From 26097532fb11d683eda5bb80b27901d6be429d18 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 6 May 2013 10:40:21 +0200 Subject: [PATCH] qt5-*.inc: let module.inc to define LICENSE * it was working for LIC_FILES_CHKSUM, but not LICENSE * we need to change order of includes, first version.inc then module.inc Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt3d.inc | 8 ++++---- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qt5-5.0.0.inc | 8 ++++---- recipes-qt/qt5/qt5-5.0.1.inc | 8 ++++---- recipes-qt/qt5/qt5-5.0.2.inc | 8 ++++---- recipes-qt/qt5/qt5-git.inc | 8 ++++---- recipes-qt/qt5/qtbase-native_5.0.0.bb | 2 +- recipes-qt/qt5/qtbase-native_5.0.1.bb | 2 +- recipes-qt/qt5/qtbase-native_5.0.2.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_5.0.0.bb | 2 +- recipes-qt/qt5/qtbase_5.0.1.bb | 2 +- recipes-qt/qt5/qtbase_5.0.2.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_5.0.0.bb | 2 +- recipes-qt/qt5/qtdeclarative_5.0.1.bb | 2 +- recipes-qt/qt5/qtdeclarative_5.0.2.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_5.0.2.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +- recipes-qt/qt5/qtimageformats_5.0.0.bb | 2 +- recipes-qt/qt5/qtimageformats_5.0.1.bb | 2 +- recipes-qt/qt5/qtimageformats_5.0.2.bb | 2 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- recipes-qt/qt5/qtjsbackend-native.inc | 6 +++--- recipes-qt/qt5/qtjsbackend-native_5.0.0.bb | 2 +- recipes-qt/qt5/qtjsbackend-native_5.0.1.bb | 2 +- recipes-qt/qt5/qtjsbackend-native_5.0.2.bb | 2 +- recipes-qt/qt5/qtjsbackend-native_git.bb | 2 +- recipes-qt/qt5/qtjsbackend.inc | 6 +++--- recipes-qt/qt5/qtjsbackend_5.0.0.bb | 2 +- recipes-qt/qt5/qtjsbackend_5.0.1.bb | 2 +- recipes-qt/qt5/qtjsbackend_5.0.2.bb | 2 +- recipes-qt/qt5/qtjsbackend_git.bb | 2 +- recipes-qt/qt5/qtjsondb_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtmultimedia_5.0.0.bb | 2 +- recipes-qt/qt5/qtmultimedia_5.0.1.bb | 2 +- recipes-qt/qt5/qtmultimedia_5.0.2.bb | 2 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtquick1_5.0.0.bb | 2 +- recipes-qt/qt5/qtquick1_5.0.1.bb | 2 +- recipes-qt/qt5/qtquick1_5.0.2.bb | 2 +- recipes-qt/qt5/qtquick1_git.bb | 2 +- recipes-qt/qt5/qtscript_5.0.0.bb | 2 +- recipes-qt/qt5/qtscript_5.0.1.bb | 2 +- recipes-qt/qt5/qtscript_5.0.2.bb | 2 +- recipes-qt/qt5/qtscript_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb | 2 +- recipes-qt/qt5/qtsvg_5.0.0.bb | 2 +- recipes-qt/qt5/qtsvg_5.0.1.bb | 2 +- recipes-qt/qt5/qtsvg_5.0.2.bb | 2 +- recipes-qt/qt5/qtsvg_git.bb | 2 +- recipes-qt/qt5/qtsystems_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb | 2 +- recipes-qt/qt5/qtwebkit_5.0.0.bb | 2 +- recipes-qt/qt5/qtwebkit_5.0.1.bb | 2 +- recipes-qt/qt5/qtwebkit_5.0.2.bb | 2 +- recipes-qt/qt5/qtwebkit_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_5.0.0.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_5.0.1.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_5.0.2.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 65 files changed, 84 insertions(+), 84 deletions(-) diff --git a/recipes-qt/qt5/qt3d.inc b/recipes-qt/qt5/qt3d.inc index 2ac6e4cdb5..de3548f25c 100644 --- a/recipes-qt/qt5/qt3d.inc +++ b/recipes-qt/qt5/qt3d.inc @@ -1,10 +1,10 @@ require qt5module.inc LICENSE = "GFDL-1.3 & LGPL-2.1 & PREVIEW.COMMERCIAL" -LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=4ac745f4b16b419fa48a24d41e983c40 \ - file://LGPL_EXCEPTION.txt;md5=eb6c371255e1262c55ae9b652a90b528 \ - file://LICENSE.PREVIEW.COMMERCIAL;md5=9d94dadfab8b246782ffea02082ee13a \ - file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4ac745f4b16b419fa48a24d41e983c40 \ + file://LGPL_EXCEPTION.txt;md5=eb6c371255e1262c55ae9b652a90b528 \ + file://LICENSE.PREVIEW.COMMERCIAL;md5=9d94dadfab8b246782ffea02082ee13a \ + file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5" INC_PR = "r1" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index e33ce9f1e6..e9c89e6623 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc # last tag before this SRCREV is 5.0.0-beta1 PV = "4.999+5.0.0-beta1+git${SRCPV}" diff --git a/recipes-qt/qt5/qt5-5.0.0.inc b/recipes-qt/qt5/qt5-5.0.0.inc index e155a207ec..85811c0fa7 100644 --- a/recipes-qt/qt5/qt5-5.0.0.inc +++ b/recipes-qt/qt5/qt5-5.0.0.inc @@ -12,7 +12,7 @@ SRC_URI += " \ S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" -LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" diff --git a/recipes-qt/qt5/qt5-5.0.1.inc b/recipes-qt/qt5/qt5-5.0.1.inc index e155a207ec..85811c0fa7 100644 --- a/recipes-qt/qt5/qt5-5.0.1.inc +++ b/recipes-qt/qt5/qt5-5.0.1.inc @@ -12,7 +12,7 @@ SRC_URI += " \ S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" -LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" diff --git a/recipes-qt/qt5/qt5-5.0.2.inc b/recipes-qt/qt5/qt5-5.0.2.inc index dc7bda1fcb..f99809ec60 100644 --- a/recipes-qt/qt5/qt5-5.0.2.inc +++ b/recipes-qt/qt5/qt5-5.0.2.inc @@ -15,7 +15,7 @@ SRC_URI += " \ S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" -LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 39e77f0927..9733a48940 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -17,7 +17,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" DEFAULT_PREFERENCE = "-1" LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" -LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" diff --git a/recipes-qt/qt5/qtbase-native_5.0.0.bb b/recipes-qt/qt5/qtbase-native_5.0.0.bb index 88c5ee1d64..1ee1693e78 100644 --- a/recipes-qt/qt5/qtbase-native_5.0.0.bb +++ b/recipes-qt/qt5/qtbase-native_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtbase-native_5.0.1.bb b/recipes-qt/qt5/qtbase-native_5.0.1.bb index f5d961305a..e1c5118b43 100644 --- a/recipes-qt/qt5/qtbase-native_5.0.1.bb +++ b/recipes-qt/qt5/qtbase-native_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtbase-native_5.0.2.bb b/recipes-qt/qt5/qtbase-native_5.0.2.bb index ae81135b5f..3df434e337 100644 --- a/recipes-qt/qt5/qtbase-native_5.0.2.bb +++ b/recipes-qt/qt5/qtbase-native_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 15e75174ef..71177825a7 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtbase_5.0.0.bb b/recipes-qt/qt5/qtbase_5.0.0.bb index a2a819e742..7f4cf2986c 100644 --- a/recipes-qt/qt5/qtbase_5.0.0.bb +++ b/recipes-qt/qt5/qtbase_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtbase_5.0.1.bb b/recipes-qt/qt5/qtbase_5.0.1.bb index f822a3e30d..2dce2c1d6a 100644 --- a/recipes-qt/qt5/qtbase_5.0.1.bb +++ b/recipes-qt/qt5/qtbase_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtbase_5.0.2.bb b/recipes-qt/qt5/qtbase_5.0.2.bb index ae81135b5f..3df434e337 100644 --- a/recipes-qt/qt5/qtbase_5.0.2.bb +++ b/recipes-qt/qt5/qtbase_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 15e75174ef..71177825a7 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtdeclarative_5.0.0.bb b/recipes-qt/qt5/qtdeclarative_5.0.0.bb index 518f70d66a..1e9876a9ba 100644 --- a/recipes-qt/qt5/qtdeclarative_5.0.0.bb +++ b/recipes-qt/qt5/qtdeclarative_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 and 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtdeclarative_5.0.1.bb b/recipes-qt/qt5/qtdeclarative_5.0.1.bb index 1c33ea56a8..df0ab3dea7 100644 --- a/recipes-qt/qt5/qtdeclarative_5.0.1.bb +++ b/recipes-qt/qt5/qtdeclarative_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 and 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtdeclarative_5.0.2.bb b/recipes-qt/qt5/qtdeclarative_5.0.2.bb index 2027336adb..5853c96cc0 100644 --- a/recipes-qt/qt5/qtdeclarative_5.0.2.bb +++ b/recipes-qt/qt5/qtdeclarative_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 2f22ee5340..b7f79bf2ae 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb b/recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb index 7f5d182735..eabe406254 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb b/recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb index e6601286bd..b42fbb396c 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.0.2.bb b/recipes-qt/qt5/qtgraphicaleffects_5.0.2.bb index 44dedf502b..99db424f9e 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_5.0.2.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.2 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 6bcf9d1aea..199214877e 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtimageformats_5.0.0.bb b/recipes-qt/qt5/qtimageformats_5.0.0.bb index 21812a94fe..2072116bf6 100644 --- a/recipes-qt/qt5/qtimageformats_5.0.0.bb +++ b/recipes-qt/qt5/qtimageformats_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtimageformats_5.0.1.bb b/recipes-qt/qt5/qtimageformats_5.0.1.bb index 40ae6cbe58..99227a31cd 100644 --- a/recipes-qt/qt5/qtimageformats_5.0.1.bb +++ b/recipes-qt/qt5/qtimageformats_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtimageformats_5.0.2.bb b/recipes-qt/qt5/qtimageformats_5.0.2.bb index b9947ae9aa..1b881650c0 100644 --- a/recipes-qt/qt5/qtimageformats_5.0.2.bb +++ b/recipes-qt/qt5/qtimageformats_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index bdc7979126..08f9bd3eba 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index cc8ef3f323..57f017dafe 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -1,8 +1,8 @@ # doesn't have GFDL-1.3 like qtbase, LICENSE files are missing in 5.0.0 and 5.0.1, this is for 5.0.2 and git LICENSE = "LGPL-2.1 | GPL-3.0" -LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ " DEPENDS = "qtbase-native" diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb index 3bcbbef98b..e6c0410625 100644 --- a/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb +++ b/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 and 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.1.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.1.bb index a215e7abb5..41b9576ef0 100644 --- a/recipes-qt/qt5/qtjsbackend-native_5.0.1.bb +++ b/recipes-qt/qt5/qtjsbackend-native_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 and 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.2.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.2.bb index c5d5a742f3..9dcbcc0112 100644 --- a/recipes-qt/qt5/qtjsbackend-native_5.0.2.bb +++ b/recipes-qt/qt5/qtjsbackend-native_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtjsbackend-native_git.bb b/recipes-qt/qt5/qtjsbackend-native_git.bb index daf0cb2752..f825b9935e 100644 --- a/recipes-qt/qt5/qtjsbackend-native_git.bb +++ b/recipes-qt/qt5/qtjsbackend-native_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc index 7ead9dde9a..5a4b90279f 100644 --- a/recipes-qt/qt5/qtjsbackend.inc +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -2,9 +2,9 @@ require qt5module.inc # doesn't have GFDL-1.3 like qtbase, LICENSE files are missing in 5.0.0 and 5.0.1, this is for 5.0.2 and git LICENSE = "LGPL-2.1 | GPL-3.0" -LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ " DEPENDS += "qtjsbackend-native" diff --git a/recipes-qt/qt5/qtjsbackend_5.0.0.bb b/recipes-qt/qt5/qtjsbackend_5.0.0.bb index 3bcbbef98b..e6c0410625 100644 --- a/recipes-qt/qt5/qtjsbackend_5.0.0.bb +++ b/recipes-qt/qt5/qtjsbackend_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 and 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtjsbackend_5.0.1.bb b/recipes-qt/qt5/qtjsbackend_5.0.1.bb index a215e7abb5..41b9576ef0 100644 --- a/recipes-qt/qt5/qtjsbackend_5.0.1.bb +++ b/recipes-qt/qt5/qtjsbackend_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 and 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtjsbackend_5.0.2.bb b/recipes-qt/qt5/qtjsbackend_5.0.2.bb index c5d5a742f3..9dcbcc0112 100644 --- a/recipes-qt/qt5/qtjsbackend_5.0.2.bb +++ b/recipes-qt/qt5/qtjsbackend_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtjsbackend_git.bb b/recipes-qt/qt5/qtjsbackend_git.bb index daf0cb2752..f825b9935e 100644 --- a/recipes-qt/qt5/qtjsbackend_git.bb +++ b/recipes-qt/qt5/qtjsbackend_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtjsondb_git.bb b/recipes-qt/qt5/qtjsondb_git.bb index 8e9bebe670..09d97324e7 100644 --- a/recipes-qt/qt5/qtjsondb_git.bb +++ b/recipes-qt/qt5/qtjsondb_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index fb4d3fa654..8596022f16 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc # LICENSE files are missing in this old SRCREV, remove when upgraded # commit 54e6103798bb098bc9e83aa77decdad4868cb98e diff --git a/recipes-qt/qt5/qtmultimedia_5.0.0.bb b/recipes-qt/qt5/qtmultimedia_5.0.0.bb index 2d703c5355..20e12c0124 100644 --- a/recipes-qt/qt5/qtmultimedia_5.0.0.bb +++ b/recipes-qt/qt5/qtmultimedia_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtmultimedia_5.0.1.bb b/recipes-qt/qt5/qtmultimedia_5.0.1.bb index dee5c9d998..3b47de084d 100644 --- a/recipes-qt/qt5/qtmultimedia_5.0.1.bb +++ b/recipes-qt/qt5/qtmultimedia_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtmultimedia_5.0.2.bb b/recipes-qt/qt5/qtmultimedia_5.0.2.bb index 5abefed0db..7b97cbd3b6 100644 --- a/recipes-qt/qt5/qtmultimedia_5.0.2.bb +++ b/recipes-qt/qt5/qtmultimedia_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.2 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index e284a739c6..207424b9a9 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtquick1_5.0.0.bb b/recipes-qt/qt5/qtquick1_5.0.0.bb index e410022b32..12d4823053 100644 --- a/recipes-qt/qt5/qtquick1_5.0.0.bb +++ b/recipes-qt/qt5/qtquick1_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtquick1_5.0.1.bb b/recipes-qt/qt5/qtquick1_5.0.1.bb index f234bbbbfc..fe762d19ae 100644 --- a/recipes-qt/qt5/qtquick1_5.0.1.bb +++ b/recipes-qt/qt5/qtquick1_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtquick1_5.0.2.bb b/recipes-qt/qt5/qtquick1_5.0.2.bb index 7b1d775b63..c20732e1ab 100644 --- a/recipes-qt/qt5/qtquick1_5.0.2.bb +++ b/recipes-qt/qt5/qtquick1_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index 7978abb69f..717a999993 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtscript_5.0.0.bb b/recipes-qt/qt5/qtscript_5.0.0.bb index 8328271eef..00b21368aa 100644 --- a/recipes-qt/qt5/qtscript_5.0.0.bb +++ b/recipes-qt/qt5/qtscript_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtscript_5.0.1.bb b/recipes-qt/qt5/qtscript_5.0.1.bb index 46a7ea9931..a8a97b8f27 100644 --- a/recipes-qt/qt5/qtscript_5.0.1.bb +++ b/recipes-qt/qt5/qtscript_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtscript_5.0.2.bb b/recipes-qt/qt5/qtscript_5.0.2.bb index 13563141d8..0bac91ada3 100644 --- a/recipes-qt/qt5/qtscript_5.0.2.bb +++ b/recipes-qt/qt5/qtscript_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 77f8c8bbd7..ceccb9712c 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index f7d324fdc1..5561f94394 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc # LICENSE files are missing in this old SRCREV, remove when upgraded # commit cf831b83142dee8114df3bc37c29116a66945f5f diff --git a/recipes-qt/qt5/qtsvg_5.0.0.bb b/recipes-qt/qt5/qtsvg_5.0.0.bb index 16dd1338bb..f37bd5b2fd 100644 --- a/recipes-qt/qt5/qtsvg_5.0.0.bb +++ b/recipes-qt/qt5/qtsvg_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtsvg_5.0.1.bb b/recipes-qt/qt5/qtsvg_5.0.1.bb index 0264c7ec85..d27fc29a95 100644 --- a/recipes-qt/qt5/qtsvg_5.0.1.bb +++ b/recipes-qt/qt5/qtsvg_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtsvg_5.0.2.bb b/recipes-qt/qt5/qtsvg_5.0.2.bb index 2622e6740c..4ce9b81155 100644 --- a/recipes-qt/qt5/qtsvg_5.0.2.bb +++ b/recipes-qt/qt5/qtsvg_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.2 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 7adc470c70..735c34467b 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb index 4b7f6acb83..e5de6d2b5b 100644 --- a/recipes-qt/qt5/qtsystems_git.bb +++ b/recipes-qt/qt5/qtsystems_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 40e386bc8d..b5119ec025 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc # qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 PV = "4.999+5.0.0-beta1+git${SRCPV}" diff --git a/recipes-qt/qt5/qtwebkit_5.0.0.bb b/recipes-qt/qt5/qtwebkit_5.0.0.bb index 6fbe9e4ace..5cb6cde99d 100644 --- a/recipes-qt/qt5/qtwebkit_5.0.0.bb +++ b/recipes-qt/qt5/qtwebkit_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtwebkit_5.0.1.bb b/recipes-qt/qt5/qtwebkit_5.0.1.bb index f91b076dee..7054af9833 100644 --- a/recipes-qt/qt5/qtwebkit_5.0.1.bb +++ b/recipes-qt/qt5/qtwebkit_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtwebkit_5.0.2.bb b/recipes-qt/qt5/qtwebkit_5.0.2.bb index f5ffb3a8b8..4d2f34d957 100644 --- a/recipes-qt/qt5/qtwebkit_5.0.2.bb +++ b/recipes-qt/qt5/qtwebkit_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index cfa3765c97..1b0737a700 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtxmlpatterns_5.0.0.bb b/recipes-qt/qt5/qtxmlpatterns_5.0.0.bb index bdb72f9f2d..59438fde54 100644 --- a/recipes-qt/qt5/qtxmlpatterns_5.0.0.bb +++ b/recipes-qt/qt5/qtxmlpatterns_5.0.0.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.0 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtxmlpatterns_5.0.1.bb b/recipes-qt/qt5/qtxmlpatterns_5.0.1.bb index 0363dca263..1e8d3c12b7 100644 --- a/recipes-qt/qt5/qtxmlpatterns_5.0.1.bb +++ b/recipes-qt/qt5/qtxmlpatterns_5.0.1.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE files are missing in 5.0.1 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ diff --git a/recipes-qt/qt5/qtxmlpatterns_5.0.2.bb b/recipes-qt/qt5/qtxmlpatterns_5.0.2.bb index bd92bd7bf0..a10c83508a 100644 --- a/recipes-qt/qt5/qtxmlpatterns_5.0.2.bb +++ b/recipes-qt/qt5/qtxmlpatterns_5.0.2.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-${PV}.inc +require ${PN}.inc # LICENSE.FDL is missing in 5.0.2, added a bit later: # commit 3bc0756a63d348d3446d9581f45429c417fd9c29 diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index f1b608e2f8..1277e3465e 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -1,5 +1,5 @@ -require ${PN}.inc require qt5-git.inc +require ${PN}.inc PR = "${INC_PR}.0"