[oe] [meta-qt5][PATCH 06/11] qt5: make qt5.inc reusable qt5-module.bbclass
Martin Jansa
martin.jansa at gmail.com
Mon Aug 24 12:45:12 UTC 2015
On Mon, Aug 24, 2015 at 12:13:52PM +0300, Samuli Piippo wrote:
> qt5.inc has common parts that can be used to build any Qt5 module.
> Make it a bbclass so that it is easily usable from other meta layers.
require recipes-qt/qt5/qt5.inc
can be used in other layers as well
>
> Signed-off-by: Samuli Piippo <samuli.piippo at theqtcompany.com>
> ---
> recipes-qt/qt5/qt5.inc => classes/qt5-module.bbclass | 0
> recipes-qt/examples/cinematicexperience_1.0.bb | 2 +-
> recipes-qt/examples/qt5everywheredemo_1.0.bb | 2 +-
> recipes-qt/examples/qt5nmapcarousedemo_1.0.bb | 2 +-
> recipes-qt/examples/qt5nmapper_1.0.bb | 2 +-
> recipes-qt/examples/qtsmarthome_1.0.bb | 2 +-
> recipes-qt/examples/quitbattery_1.0.0.bb | 2 +-
> recipes-qt/examples/quitindicators_1.0.1.bb | 2 +-
> recipes-qt/libconnman-qt/libconnman-qt5_git.bb | 2 +-
> recipes-qt/qt5/qt3d_git.bb | 2 +-
> recipes-qt/qt5/qtbase_git.bb | 2 +-
> recipes-qt/qt5/qtconnectivity_git.bb | 2 +-
> recipes-qt/qt5/qtdeclarative_git.bb | 2 +-
> recipes-qt/qt5/qtenginio_git.bb | 2 +-
> recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +-
> recipes-qt/qt5/qtimageformats_git.bb | 2 +-
> recipes-qt/qt5/qtlocation_git.bb | 2 +-
> recipes-qt/qt5/qtmultimedia_git.bb | 2 +-
> recipes-qt/qt5/qtquick1_git.bb | 2 +-
> recipes-qt/qt5/qtquickcontrols_git.bb | 2 +-
> recipes-qt/qt5/qtscript_git.bb | 2 +-
> recipes-qt/qt5/qtsensors_git.bb | 2 +-
> recipes-qt/qt5/qtserialport_git.bb | 2 +-
> recipes-qt/qt5/qtsvg_git.bb | 2 +-
> recipes-qt/qt5/qtsystems_git.bb | 2 +-
> recipes-qt/qt5/qttools_git.bb | 2 +-
> recipes-qt/qt5/qttranslations_git.bb | 2 +-
> recipes-qt/qt5/qtwayland_git.bb | 2 +-
> recipes-qt/qt5/qtwebchannel_git.bb | 2 +-
> recipes-qt/qt5/qtwebengine_git.bb | 2 +-
> recipes-qt/qt5/qtwebkit-examples_git.bb | 2 +-
> recipes-qt/qt5/qtwebkit_git.bb | 2 +-
> recipes-qt/qt5/qtwebsockets_git.bb | 2 +-
> recipes-qt/qt5/qtx11extras_git.bb | 2 +-
> recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +-
> 35 files changed, 34 insertions(+), 34 deletions(-)
> rename recipes-qt/qt5/qt5.inc => classes/qt5-module.bbclass (100%)
>
> diff --git a/recipes-qt/qt5/qt5.inc b/classes/qt5-module.bbclass
> similarity index 100%
> rename from recipes-qt/qt5/qt5.inc
> rename to classes/qt5-module.bbclass
> diff --git a/recipes-qt/examples/cinematicexperience_1.0.bb b/recipes-qt/examples/cinematicexperience_1.0.bb
> index 116127f..b1eee73 100644
> --- a/recipes-qt/examples/cinematicexperience_1.0.bb
> +++ b/recipes-qt/examples/cinematicexperience_1.0.bb
> @@ -21,7 +21,7 @@ S = "${WORKDIR}/Qt5_CinematicExperience_rpi_${PV}/"
> DEPENDS = "qtdeclarative qtgraphicaleffects"
> RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins"
>
> -require recipes-qt/qt5/qt5.inc
> +inherit qt5-module
>
> do_install() {
> install -d ${D}${datadir}/${P}
> diff --git a/recipes-qt/examples/qt5everywheredemo_1.0.bb b/recipes-qt/examples/qt5everywheredemo_1.0.bb
> index 0546b00..b906741 100644
> --- a/recipes-qt/examples/qt5everywheredemo_1.0.bb
> +++ b/recipes-qt/examples/qt5everywheredemo_1.0.bb
> @@ -11,7 +11,7 @@ SRC_URI = "${QT_GIT}/qt-labs/qt5-everywhere-demo.git"
>
> S = "${WORKDIR}/git/QtDemo"
>
> -require recipes-qt/qt5/qt5.inc
> +inherit qt5-module
>
> do_install() {
> install -d ${D}${datadir}/${P}
> diff --git a/recipes-qt/examples/qt5nmapcarousedemo_1.0.bb b/recipes-qt/examples/qt5nmapcarousedemo_1.0.bb
> index 7edf727..67525ca 100644
> --- a/recipes-qt/examples/qt5nmapcarousedemo_1.0.bb
> +++ b/recipes-qt/examples/qt5nmapcarousedemo_1.0.bb
> @@ -12,7 +12,7 @@ SRC_URI[sha256sum] = "445da212074a10a432f4508d125814212bbe7a967bfa47b015b92dfac6
>
> S = "${WORKDIR}/Qt5_NMap_CarouselDemo_1.0"
>
> -require recipes-qt/qt5/qt5.inc
> +inherit qt5-module
>
> do_install() {
> install -d ${D}${datadir}/${P}
> diff --git a/recipes-qt/examples/qt5nmapper_1.0.bb b/recipes-qt/examples/qt5nmapper_1.0.bb
> index 77cb067..cc61b18 100644
> --- a/recipes-qt/examples/qt5nmapper_1.0.bb
> +++ b/recipes-qt/examples/qt5nmapper_1.0.bb
> @@ -13,7 +13,7 @@ SRC_URI[sha256sum] = "607fbf4c448f00d3c563f9ef8a582bcb6e8fe550e80b56bf8d9127a417
>
> S = "${WORKDIR}/Qt5_NMapper_1.0"
>
> -require recipes-qt/qt5/qt5.inc
> +inherit qt5-module
>
> do_install() {
> install -d ${D}${datadir}/${P}
> diff --git a/recipes-qt/examples/qtsmarthome_1.0.bb b/recipes-qt/examples/qtsmarthome_1.0.bb
> index 944c4dc..3af01f4 100644
> --- a/recipes-qt/examples/qtsmarthome_1.0.bb
> +++ b/recipes-qt/examples/qtsmarthome_1.0.bb
> @@ -13,7 +13,7 @@ SRC_URI[sha256sum] = "fceaa813c33e462bad6c0383eaef81a6f6e586c15d1fa73898173b517f
>
> S = "${WORKDIR}/smarthome_src"
>
> -require recipes-qt/qt5/qt5.inc
> +inherit qt5-module
>
> do_install() {
> install -d ${D}${datadir}/${P}
> diff --git a/recipes-qt/examples/quitbattery_1.0.0.bb b/recipes-qt/examples/quitbattery_1.0.0.bb
> index ea218d7..a8fb77d 100644
> --- a/recipes-qt/examples/quitbattery_1.0.0.bb
> +++ b/recipes-qt/examples/quitbattery_1.0.0.bb
> @@ -12,7 +12,7 @@ SRC_URI[sha256sum] = "38dcb7630553c397f9d8a53c6411b1a6237956ed8dd4859e01487b1dd8
>
> S = "${WORKDIR}/QUItBattery_1.0.0"
>
> -require recipes-qt/qt5/qt5.inc
> +inherit qt5-module
>
> do_install() {
> install -d ${D}${datadir}/${P}
> diff --git a/recipes-qt/examples/quitindicators_1.0.1.bb b/recipes-qt/examples/quitindicators_1.0.1.bb
> index 19a861a..0377350 100644
> --- a/recipes-qt/examples/quitindicators_1.0.1.bb
> +++ b/recipes-qt/examples/quitindicators_1.0.1.bb
> @@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "db84112adbde9b6f28c129e8fb37a6912f4bc34bed18e57f570fb78ea0
>
> S = "${WORKDIR}/QUItIndicators_1.0.1"
>
> -require recipes-qt/qt5/qt5.inc
> +inherit qt5-module
>
> do_install() {
> install -d ${D}${datadir}/${P}
> diff --git a/recipes-qt/libconnman-qt/libconnman-qt5_git.bb b/recipes-qt/libconnman-qt/libconnman-qt5_git.bb
> index f79dc0c..fcd7cbf 100644
> --- a/recipes-qt/libconnman-qt/libconnman-qt5_git.bb
> +++ b/recipes-qt/libconnman-qt/libconnman-qt5_git.bb
> @@ -1,4 +1,4 @@
> -require recipes-qt/qt5/qt5.inc
> +inherit qt5-module
>
> SUMMARY = "Qt Library for ConnMan"
> HOMEPAGE = "https://github.com/nemomobile/libconnman-qt"
> diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
> index 62f17e1..e658690 100644
> --- a/recipes-qt/qt5/qt3d_git.bb
> +++ b/recipes-qt/qt5/qt3d_git.bb
> @@ -1,4 +1,4 @@
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> LICENSE = "GFDL-1.3 & LGPL-2.1 & DIGIA-TPLA-2.4 | GPL-3.0"
> diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
> index 33620cb..92faf29 100644
> --- a/recipes-qt/qt5/qtbase_git.bb
> +++ b/recipes-qt/qt5/qtbase_git.bb
> @@ -1,4 +1,4 @@
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
> diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
> index c758d04..688d844 100644
> --- a/recipes-qt/qt5/qtconnectivity_git.bb
> +++ b/recipes-qt/qt5/qtconnectivity_git.bb
> @@ -1,4 +1,4 @@
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0"
> diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
> index d186705..273891b 100644
> --- a/recipes-qt/qt5/qtdeclarative_git.bb
> +++ b/recipes-qt/qt5/qtdeclarative_git.bb
> @@ -1,4 +1,4 @@
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> # There are no LGPLv3-only licensed files in this component.
> diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb
> index a0aff8f..2edc931 100644
> --- a/recipes-qt/qt5/qtenginio_git.bb
> +++ b/recipes-qt/qt5/qtenginio_git.bb
> @@ -1,4 +1,4 @@
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> LICENSE = "BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
> diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
> index 9da5c94..0641f80 100644
> --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
> +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
> @@ -1,4 +1,4 @@
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> # There are no LGPLv3-only licensed files in this component.
> diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
> index 31d4fb0..17784c0 100644
> --- a/recipes-qt/qt5/qtimageformats_git.bb
> +++ b/recipes-qt/qt5/qtimageformats_git.bb
> @@ -1,4 +1,4 @@
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0"
> diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
> index 12416bb..0264b93 100644
> --- a/recipes-qt/qt5/qtlocation_git.bb
> +++ b/recipes-qt/qt5/qtlocation_git.bb
> @@ -1,4 +1,4 @@
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0"
> diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
> index bab9bee..abaa28f 100644
> --- a/recipes-qt/qt5/qtmultimedia_git.bb
> +++ b/recipes-qt/qt5/qtmultimedia_git.bb
> @@ -1,4 +1,4 @@
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> # There are no LGPLv3-only licensed files in this component.
> diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
> index 928963b..994d0bc 100644
> --- a/recipes-qt/qt5/qtquick1_git.bb
> +++ b/recipes-qt/qt5/qtquick1_git.bb
> @@ -1,4 +1,4 @@
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> # There are no LGPLv3-only licensed files in this component.
> diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
> index af11119..769c191 100644
> --- a/recipes-qt/qt5/qtquickcontrols_git.bb
> +++ b/recipes-qt/qt5/qtquickcontrols_git.bb
> @@ -1,4 +1,4 @@
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0"
> diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
> index 5751e20..6c1c20c 100644
> --- a/recipes-qt/qt5/qtscript_git.bb
> +++ b/recipes-qt/qt5/qtscript_git.bb
> @@ -1,4 +1,4 @@
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> # There are no LGPLv3-only licensed files in this component.
> diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
> index ec33355..ee1f579 100644
> --- a/recipes-qt/qt5/qtsensors_git.bb
> +++ b/recipes-qt/qt5/qtsensors_git.bb
> @@ -1,4 +1,4 @@
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> # There are no LGPLv3-only licensed files in this component.
> diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
> index c59eef6..19748c2 100644
> --- a/recipes-qt/qt5/qtserialport_git.bb
> +++ b/recipes-qt/qt5/qtserialport_git.bb
> @@ -1,4 +1,4 @@
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> # text of LGPL_EXCEPTION.txt and LICENSE.FDL is slightly different than what
> diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
> index 1dce8c6..6350b38 100644
> --- a/recipes-qt/qt5/qtsvg_git.bb
> +++ b/recipes-qt/qt5/qtsvg_git.bb
> @@ -1,4 +1,4 @@
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> # There are no LGPLv3-only licensed files in this component.
> diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb
> index edc0360..6bde2af 100644
> --- a/recipes-qt/qt5/qtsystems_git.bb
> +++ b/recipes-qt/qt5/qtsystems_git.bb
> @@ -1,4 +1,4 @@
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0"
> diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
> index a4f63c7..e27d6ef 100644
> --- a/recipes-qt/qt5/qttools_git.bb
> +++ b/recipes-qt/qt5/qttools_git.bb
> @@ -1,4 +1,4 @@
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
> diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
> index 9341453..75130b7 100644
> --- a/recipes-qt/qt5/qttranslations_git.bb
> +++ b/recipes-qt/qt5/qttranslations_git.bb
> @@ -1,4 +1,4 @@
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> LICENSE = "(LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
> diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
> index 0be7afe..83cdbf4 100644
> --- a/recipes-qt/qt5/qtwayland_git.bb
> +++ b/recipes-qt/qt5/qtwayland_git.bb
> @@ -1,4 +1,4 @@
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> # There are no LGPLv3-only licensed files in this component.
> diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
> index 8433652..ce5f2fe 100644
> --- a/recipes-qt/qt5/qtwebchannel_git.bb
> +++ b/recipes-qt/qt5/qtwebchannel_git.bb
> @@ -1,4 +1,4 @@
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> # There are no LGPLv3-only licensed files in this component.
> diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
> index 4b89ddd..3bd75af 100644
> --- a/recipes-qt/qt5/qtwebengine_git.bb
> +++ b/recipes-qt/qt5/qtwebengine_git.bb
> @@ -25,7 +25,7 @@ inherit gettext
> inherit pythonnative
> inherit perlnative
>
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> # To avoid trouble start with not separated build directory
> diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb
> index 5fd6436..f98dd63 100644
> --- a/recipes-qt/qt5/qtwebkit-examples_git.bb
> +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb
> @@ -1,4 +1,4 @@
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> # There are no LGPLv3-only licensed files in this component.
> diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
> index db1a098..674d8ed 100644
> --- a/recipes-qt/qt5/qtwebkit_git.bb
> +++ b/recipes-qt/qt5/qtwebkit_git.bb
> @@ -1,4 +1,4 @@
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> LICENSE = "BSD & LGPLv2+ | GPL-2.0"
> diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
> index 85e9156..bd77d52 100644
> --- a/recipes-qt/qt5/qtwebsockets_git.bb
> +++ b/recipes-qt/qt5/qtwebsockets_git.bb
> @@ -1,4 +1,4 @@
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> LICENSE = "GFDL-1.3 & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
> diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
> index 6f60f2b..6428711 100644
> --- a/recipes-qt/qt5/qtx11extras_git.bb
> +++ b/recipes-qt/qt5/qtx11extras_git.bb
> @@ -1,4 +1,4 @@
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0"
> diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
> index da2255a..98bab6e 100644
> --- a/recipes-qt/qt5/qtxmlpatterns_git.bb
> +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
> @@ -1,4 +1,4 @@
> -require qt5.inc
> +inherit qt5-module
> require qt5-git.inc
>
> # There are no LGPLv3-only licensed files in this component.
> --
> 1.9.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20150824/17be185c/attachment-0002.sig>
More information about the Openembedded-devel
mailing list