upstreaming Qt for Device Creation changes

PATCH Superseded Samuli Piippo 3 participants 18 messages Aug 24, 2015 – Oct 14, 2015

Share & tools

Samuli Piippo

author

2015-08-24 09:29 UTC #0 lore raw

cover upstreaming Qt for Device Creation changes

As part of Qt for Device Creation [1], we are starting to use meta-qt5 layer when creating images for our supported devices. We have done number of changes to the layer when intergrating it with our internal layer. We would now like to upstream those changes.

[1] https://www.qt.io/qt-for-device-creation

The following changes since commit d2c05c81e8230358dca80cf9df67e49f9f672a29:

libconnman-qt5: update to 1.0.91 (2015-07-31 16:23:35 +0200)

are available in the git repository at:

git://github.com/sapiippo/meta-qt5 master
https://github.com/sapiippo/meta-qt5/tree/master

Samuli Piippo (11):
qt5: make populate_sdk_qt5 reusable
qt5: improve Qt module package handling
qt5: improve support for native and nativesdk modules
qt5: add host paths to qt.conf
qt5: disable debian auto renaming
qt5: make qt5.inc reusable qt5-module.bbclass
qttools: use one recipe for all compilations
qtbase: remove dependency to sqlite
qtbase: PACKAGECONFIGs for libproxy and libinput
qtlocation: use correct dependencies
qtwebengine: fix problem with recursive qmake call

 classes/populate_sdk_qt5.bbclass                   | 11 +---
 classes/qmake5.bbclass                             |  8 +++
 classes/qmake5_base.bbclass                        | 11 ++++
 .../qt5/qt5.inc => classes/qt5-module.bbclass      | 38 +++++++++++-
 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/meta/meta-toolchain-qt5.bb              |  4 ++
 recipes-qt/qt5/nativesdk-qttools_git.bb            | 45 --------------
 recipes-qt/qt5/qt3d_git.bb                         |  2 +-
 recipes-qt/qt5/qtbase_git.bb                       |  6 +-
 recipes-qt/qt5/qtconnectivity_git.bb               |  2 +-
 recipes-qt/qt5/qtdeclarative_git.bb                |  4 +-
 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                   |  5 +-
 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-native_git.bb               | 26 --------
 recipes-qt/qt5/qttools_git.bb                      | 11 +++-
 recipes-qt/qt5/qttranslations_git.bb               |  2 +-
 recipes-qt/qt5/qtwayland_git.bb                    |  2 +-
 recipes-qt/qt5/qtwebchannel_git.bb                 |  2 +-
 .../0005-Generate-usable-qmake_extras.gypi.patch   | 71 ++++++++++++++++++++++
 recipes-qt/qt5/qtwebengine_git.bb                  |  3 +-
 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                |  4 +-
 42 files changed, 183 insertions(+), 120 deletions(-)
 rename recipes-qt/qt5/qt5.inc => classes/qt5-module.bbclass (86%)
 delete mode 100644 recipes-qt/qt5/nativesdk-qttools_git.bb
 delete mode 100644 recipes-qt/qt5/qttools-native_git.bb
 create mode 100644 recipes-qt/qt5/qtwebengine/0005-Generate-usable-qmake_extras.gypi.patch

Signature · 1 line

1.9.1

Samuli Piippo

author

2015-08-24 09:28 UTC #1 lore raw

PATCH 1/11 qt5: make populate_sdk_qt5 reusable

Move task definitions from populate_sdk_qt5.bbclass to the toolchain recipe, so that populate_sdk_qt5 can be reused in different toolchain meta recipes.

Signed-off-by Samuli Piippo <[email protected]>

---
 classes/populate_sdk_qt5.bbclass      | 5 -----
 recipes-qt/meta/meta-toolchain-qt5.bb | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)

classes/populate_sdk_qt5.bbclass +0 -5

index 79df489..d29ec36 100644
@@ -1,8 +1,5 @@
 # Copyright (C) 2014 O.S. Systems Software LTDA.
 
-TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-qt5-toolchain-host"
-TOOLCHAIN_TARGET_TASK += "packagegroup-qt5-toolchain-target"
-
 # This allow reuse of Qt paths
 inherit qmake5_paths

@@ -33,5 +30,3 @@ create_sdk_files_prepend () {
     echo 'HostPrefix = ${SDKPATHNATIVE}' >> $qtconf
     echo 'HostBinaries = ${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}' >> $qtconf
 }
-
-FEATURE_PACKAGES_qtcreator-debug = "packagegroup-qt5-qtcreator-debug"

recipes-qt/meta/meta-toolchain-qt5.bb +4 -0

index 8991176..11b7962 100644
@@ -5,3 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 inherit populate_sdk populate_sdk_qt5
+
+TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-qt5-toolchain-host"
+TOOLCHAIN_TARGET_TASK += "packagegroup-qt5-toolchain-target"
+FEATURE_PACKAGES_qtcreator-debug = "packagegroup-qt5-qtcreator-debug"

Signature · 1 line

1.9.1

Samuli Piippo

author

2015-08-24 09:29 UTC #2 lore raw

PATCH 2/11 qt5: improve Qt module package handling

In reply to Samuli Piippo

Make it simpler to add Qt modules to image and toolchain, without need to specify each subpackage separately. All Qt modules should provide the ${PN} package, so create it even if empty. Make the ${PN} package also recommend all subpackages that are normally required at run time, namely plugins. Do the same for ${PN}-dev and ${PN}-dbg packages.

Signed-off-by Samuli Piippo <[email protected]>

---
 recipes-qt/qt5/qt5.inc | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

recipes-qt/qt5/qt5.inc +19 -2

index 2fc5367..8caaad3 100644
@@ -47,6 +47,24 @@ INSANE_SKIP_${PN}-examples-dev += "libdir"
 
 PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples "
 
+ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY_${PN}-dbg = "1"
+
+RRECOMMENDS_${PN} = " \
+    ${PN}-plugins \
+    ${PN}-qmlplugins \
+    "
+
+RRECOMMENDS_${PN}-dev = " \
+    ${PN} \
+    ${PN}-mkspecs \
+    "
+
+RRECOMMENDS_${PN}-dbg = " \
+    ${PN}-plugins-dbg \
+    ${PN}-qmlplugins-dbg \
+    "
+
 # extra -dbg packages
 FILES_${PN}-qmlplugins-dbg = " \
     ${OE_QMAKE_PATH_QML}/*/.debug \

@@ -135,8 +153,7 @@ FILES_${PN}-staticdev += " \
     ${OE_QMAKE_PATH_LIBS}/*.a \
 "
 FILES_${PN}-examples = " \
-    ${OE_QMAKE_PATH_EXAMPLES}/README \
-    ${OE_QMAKE_PATH_EXAMPLES}/*/* \
+    ${OE_QMAKE_PATH_EXAMPLES}/* \
 "
 FILES_${PN}-examples-dev = " \
     ${OE_QMAKE_PATH_EXAMPLES}/*${SOLIBSDEV} \

Signature · 1 line

1.9.1

Samuli Piippo

author

2015-08-24 09:29 UTC #3 lore raw

PATCH 3/11 qt5: improve support for native and nativesdk modules

In reply to Samuli Piippo

Change qmake.bbclass to support building native and nativesdk packages, so that qmake or qt5-module can be inherited and BBCLASSEXTEND used to create native and nativesdk packages.

qtxmlpatterns and qtdeclarative native and nativesdk modules are required for Qt Quick Compiler.

Signed-off-by Samuli Piippo <[email protected]>

---
 classes/qmake5.bbclass              |  8 ++++++++
 classes/qmake5_base.bbclass         | 11 +++++++++++
 recipes-qt/qt5/qt5.inc              |  2 +-
 recipes-qt/qt5/qtdeclarative_git.bb |  2 ++
 recipes-qt/qt5/qtxmlpatterns_git.bb |  2 ++
 5 files changed, 24 insertions(+), 1 deletion(-)

classes/qmake5.bbclass +8 -0

index b056ea7..2b43f2e 100644
@@ -13,3 +13,11 @@ do_configure() {
 do_install() {
     qmake5_base_do_install
 }
+
+do_install_class-native() {
+    qmake5_base_native_do_install
+}
+
+do_install_class-nativesdk() {
+    qmake5_base_nativesdk_do_install
+}

classes/qmake5_base.bbclass +11 -0

index 44575c4..ffb3103 100644
@@ -166,6 +166,17 @@ qmake5_base_do_configure () {
     ${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT} ${OE_QMAKE_RECURSIVE} $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling $CMD"
 }
 
+qmake5_base_native_do_install() {
+    oe_runmake install INSTALL_ROOT=${D}
+}
+
+qmake5_base_nativesdk_do_install() {
+    # Fix install paths for all
+    find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_HOST},(INSTALL_ROOT),g"
+
+    oe_runmake install INSTALL_ROOT=${D}
+}
+
 qmake5_base_do_install() {
     # Fix install paths for all
     find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g"

recipes-qt/qt5/qt5.inc +1 -1

index 8caaad3..36d77db 100644
@@ -50,7 +50,7 @@ PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplu
 ALLOW_EMPTY_${PN} = "1"
 ALLOW_EMPTY_${PN}-dbg = "1"
 
-RRECOMMENDS_${PN} = " \
+RRECOMMENDS_${PN}_class-target = " \
     ${PN}-plugins \
     ${PN}-qmlplugins \
     "

recipes-qt/qt5/qtdeclarative_git.bb +2 -0

index 9333016..d186705 100644
@@ -28,3 +28,5 @@ do_configure_prepend() {
 EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
 
 SRCREV = "2fdb6eba0a58b629db32f9eefec2f26df08d3d2e"
+
+BBCLASSEXTEND =+ "native nativesdk"

recipes-qt/qt5/qtxmlpatterns_git.bb +2 -0

index 1be6853..da2255a 100644
@@ -13,3 +13,5 @@ LIC_FILES_CHKSUM = " \
 DEPENDS += "qtbase"
 
 SRCREV = "c21924d67a8ef39282afdf3ae6fef798dfca7135"
+
+BBCLASSEXTEND =+ "native nativesdk"

Signature · 1 line

1.9.1

Samuli Piippo

author

2015-08-24 09:29 UTC #4 lore raw

PATCH 4/11 qt5: add host paths to qt.conf

In reply to Samuli Piippo

Add missing HostData and HostLibraries paths to qt.conf for qmake. Using the target sysroot for the HostData, allows us to remove the symbolic link for the mkspecs.

Signed-off-by Samuli Piippo <[email protected]>

---
 classes/populate_sdk_qt5.bbclass | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

classes/populate_sdk_qt5.bbclass +2 -4

index d29ec36..3f33b23 100644
@@ -4,10 +4,6 @@
 inherit qmake5_paths
 
 create_sdk_files_prepend () {
-    # make a symbolic link to mkspecs for compatibility with QTCreator
-    (cd ${SDK_OUTPUT}/${SDKPATHNATIVE}; \
-         ln -sf ${SDKTARGETSYSROOT}${libdir}/${QT_DIR_NAME}/mkspecs mkspecs;)
-
     # Generate a qt.conf file to be deployed with the SDK
     qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf
     touch $qtconf

@@ -28,5 +24,7 @@ create_sdk_files_prepend () {
     echo 'Examples = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_EXAMPLES}' >> $qtconf
     echo 'Tests = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_TESTS}' >> $qtconf
     echo 'HostPrefix = ${SDKPATHNATIVE}' >> $qtconf
+    echo 'HostData = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_ARCHDATA}' >> $qtconf
     echo 'HostBinaries = ${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}' >> $qtconf
+    echo 'HostLibraries = ${SDKPATHNATIVE}${OE_QMAKE_PATH_LIBS}' >> $qtconf
 }

Signature · 1 line

1.9.1

Samuli Piippo

author

2015-08-24 09:29 UTC #5 lore raw

PATCH 5/11 qt5: disable debian auto renaming

In reply to Samuli Piippo

Some of the Qt modules have multiple libs, which prevents debian auto renaming to work correctly. Instead of only having some modules renamed, disable renaming for all Qt module packages, so that all they all are named as ${PN}.

Signed-off-by Samuli Piippo <[email protected]>

---
 recipes-qt/qt5/qt5.inc | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

recipes-qt/qt5/qt5.inc +17 -0

index 36d77db..b19d271 100644
@@ -47,6 +47,23 @@ INSANE_SKIP_${PN}-examples-dev += "libdir"
 
 PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples "
 
+DEBIAN_NOAUTONAME_${PN} = "1"
+DEBIAN_NOAUTONAME_${PN}-dbg = "1"
+DEBIAN_NOAUTONAME_${PN}-dev = "1"
+DEBIAN_NOAUTONAME_${PN}-staticdev = "1"
+DEBIAN_NOAUTONAME_${PN}${LICENSE_PACKAGE_SUFFIX} = "1"
+DEBIAN_NOAUTONAME_${PN}-qmlplugins-dbg = "1"
+DEBIAN_NOAUTONAME_${PN}-tools-dbg = "1"
+DEBIAN_NOAUTONAME_${PN}-plugins-dbg = "1"
+DEBIAN_NOAUTONAME_${PN}-qmlplugins = "1"
+DEBIAN_NOAUTONAME_${PN}-tools = "1"
+DEBIAN_NOAUTONAME_${PN}-plugins = "1"
+DEBIAN_NOAUTONAME_${PN}-mkspecs = "1"
+DEBIAN_NOAUTONAME_${PN}-examples-dev = "1"
+DEBIAN_NOAUTONAME_${PN}-examples-staticdev = "1"
+DEBIAN_NOAUTONAME_${PN}-examples-dbg = "1"
+DEBIAN_NOAUTONAME_${PN}-examples = "1"
+
 ALLOW_EMPTY_${PN} = "1"
 ALLOW_EMPTY_${PN}-dbg = "1"

Signature · 1 line

1.9.1

Samuli Piippo

author

2015-08-24 09:28 UTC #6 lore raw

PATCH 6/11 qt5: make qt5.inc reusable qt5-module.bbclass

In reply to Samuli Piippo

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.

Signed-off-by Samuli Piippo <[email protected]>

---
 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%)

classes/qt5-module.bbclass renamed from recipes-qt/qt5/qt5.inc +0 -0

similarity index 100%
rename from recipes-qt/qt5/qt5.inc
rename to classes/qt5-module.bbclass

recipes-qt/examples/cinematicexperience_1.0.bb +1 -1

index 116127f..b1eee73 100644
@@ -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}

recipes-qt/examples/qt5everywheredemo_1.0.bb +1 -1

index 0546b00..b906741 100644
@@ -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}

recipes-qt/examples/qt5nmapcarousedemo_1.0.bb +1 -1

index 7edf727..67525ca 100644
@@ -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}

recipes-qt/examples/qt5nmapper_1.0.bb +1 -1

index 77cb067..cc61b18 100644
@@ -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}

recipes-qt/examples/qtsmarthome_1.0.bb +1 -1

index 944c4dc..3af01f4 100644
@@ -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}

recipes-qt/examples/quitbattery_1.0.0.bb +1 -1

index ea218d7..a8fb77d 100644
@@ -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}

recipes-qt/examples/quitindicators_1.0.1.bb +1 -1

index 19a861a..0377350 100644
@@ -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}

recipes-qt/libconnman-qt/libconnman-qt5_git.bb +1 -1

index f79dc0c..fcd7cbf 100644
@@ -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"

recipes-qt/qt5/qt3d_git.bb +1 -1

index 62f17e1..e658690 100644
@@ -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"

recipes-qt/qt5/qtbase_git.bb +1 -1

index 33620cb..92faf29 100644
@@ -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)"

recipes-qt/qt5/qtconnectivity_git.bb +1 -1

index c758d04..688d844 100644
@@ -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"

recipes-qt/qt5/qtdeclarative_git.bb +1 -1

index d186705..273891b 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtenginio_git.bb +1 -1

index a0aff8f..2edc931 100644
@@ -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)"

recipes-qt/qt5/qtgraphicaleffects_git.bb +1 -1

index 9da5c94..0641f80 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtimageformats_git.bb +1 -1

index 31d4fb0..17784c0 100644
@@ -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"

recipes-qt/qt5/qtlocation_git.bb +1 -1

index 12416bb..0264b93 100644
@@ -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"

recipes-qt/qt5/qtmultimedia_git.bb +1 -1

index bab9bee..abaa28f 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtquick1_git.bb +1 -1

index 928963b..994d0bc 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtquickcontrols_git.bb +1 -1

index af11119..769c191 100644
@@ -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"

recipes-qt/qt5/qtscript_git.bb +1 -1

index 5751e20..6c1c20c 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtsensors_git.bb +1 -1

index ec33355..ee1f579 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtserialport_git.bb +1 -1

index c59eef6..19748c2 100644
@@ -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

recipes-qt/qt5/qtsvg_git.bb +1 -1

index 1dce8c6..6350b38 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtsystems_git.bb +1 -1

index edc0360..6bde2af 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0"

recipes-qt/qt5/qttools_git.bb +1 -1

index a4f63c7..e27d6ef 100644
@@ -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)"

recipes-qt/qt5/qttranslations_git.bb +1 -1

index 9341453..75130b7 100644
@@ -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)"

recipes-qt/qt5/qtwayland_git.bb +1 -1

index 0be7afe..83cdbf4 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtwebchannel_git.bb +1 -1

index 8433652..ce5f2fe 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtwebengine_git.bb +1 -1

index 4b89ddd..3bd75af 100644
@@ -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

recipes-qt/qt5/qtwebkit-examples_git.bb +1 -1

index 5fd6436..f98dd63 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtwebkit_git.bb +1 -1

index db1a098..674d8ed 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "BSD & LGPLv2+ | GPL-2.0"

recipes-qt/qt5/qtwebsockets_git.bb +1 -1

index 85e9156..bd77d52 100644
@@ -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)"

recipes-qt/qt5/qtx11extras_git.bb +1 -1

index 6f60f2b..6428711 100644
@@ -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"

recipes-qt/qt5/qtxmlpatterns_git.bb +1 -1

index da2255a..98bab6e 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.

Signature · 1 line

1.9.1

Martin Jansa

2015-08-24 12:45 UTC #7 lore raw

Re: [meta-qt5][PATCH 06/11] qt5: make qt5.inc reusable qt5-module.bbclass

Quoted 2 lines · Samuli Piippo

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

Quoted 417 lines

Signed-off-by Samuli Piippo <[email protected]>

---
 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%)

classes/qt5-module.bbclass renamed from recipes-qt/qt5/qt5.inc +0 -0

similarity index 100%
rename from recipes-qt/qt5/qt5.inc
rename to classes/qt5-module.bbclass

recipes-qt/examples/cinematicexperience_1.0.bb +1 -1

index 116127f..b1eee73 100644
@@ -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}

recipes-qt/examples/qt5everywheredemo_1.0.bb +1 -1

index 0546b00..b906741 100644
@@ -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}

recipes-qt/examples/qt5nmapcarousedemo_1.0.bb +1 -1

index 7edf727..67525ca 100644
@@ -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}

recipes-qt/examples/qt5nmapper_1.0.bb +1 -1

index 77cb067..cc61b18 100644
@@ -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}

recipes-qt/examples/qtsmarthome_1.0.bb +1 -1

index 944c4dc..3af01f4 100644
@@ -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}

recipes-qt/examples/quitbattery_1.0.0.bb +1 -1

index ea218d7..a8fb77d 100644
@@ -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}

recipes-qt/examples/quitindicators_1.0.1.bb +1 -1

index 19a861a..0377350 100644
@@ -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}

recipes-qt/libconnman-qt/libconnman-qt5_git.bb +1 -1

index f79dc0c..fcd7cbf 100644
@@ -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"

recipes-qt/qt5/qt3d_git.bb +1 -1

index 62f17e1..e658690 100644
@@ -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"

recipes-qt/qt5/qtbase_git.bb +1 -1

index 33620cb..92faf29 100644
@@ -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)"

recipes-qt/qt5/qtconnectivity_git.bb +1 -1

index c758d04..688d844 100644
@@ -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"

recipes-qt/qt5/qtdeclarative_git.bb +1 -1

index d186705..273891b 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtenginio_git.bb +1 -1

index a0aff8f..2edc931 100644
@@ -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)"

recipes-qt/qt5/qtgraphicaleffects_git.bb +1 -1

index 9da5c94..0641f80 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtimageformats_git.bb +1 -1

index 31d4fb0..17784c0 100644
@@ -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"

recipes-qt/qt5/qtlocation_git.bb +1 -1

index 12416bb..0264b93 100644
@@ -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"

recipes-qt/qt5/qtmultimedia_git.bb +1 -1

index bab9bee..abaa28f 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtquick1_git.bb +1 -1

index 928963b..994d0bc 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtquickcontrols_git.bb +1 -1

index af11119..769c191 100644
@@ -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"

recipes-qt/qt5/qtscript_git.bb +1 -1

index 5751e20..6c1c20c 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtsensors_git.bb +1 -1

index ec33355..ee1f579 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtserialport_git.bb +1 -1

index c59eef6..19748c2 100644
@@ -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

recipes-qt/qt5/qtsvg_git.bb +1 -1

index 1dce8c6..6350b38 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtsystems_git.bb +1 -1

index edc0360..6bde2af 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0"

recipes-qt/qt5/qttools_git.bb +1 -1

index a4f63c7..e27d6ef 100644
@@ -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)"

recipes-qt/qt5/qttranslations_git.bb +1 -1

index 9341453..75130b7 100644
@@ -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)"

recipes-qt/qt5/qtwayland_git.bb +1 -1

index 0be7afe..83cdbf4 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtwebchannel_git.bb +1 -1

index 8433652..ce5f2fe 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtwebengine_git.bb +1 -1

index 4b89ddd..3bd75af 100644
@@ -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

recipes-qt/qt5/qtwebkit-examples_git.bb +1 -1

index 5fd6436..f98dd63 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtwebkit_git.bb +1 -1

index db1a098..674d8ed 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "BSD & LGPLv2+ | GPL-2.0"

recipes-qt/qt5/qtwebsockets_git.bb +1 -1

index 85e9156..bd77d52 100644
@@ -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)"

recipes-qt/qt5/qtx11extras_git.bb +1 -1

index 6f60f2b..6428711 100644
@@ -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"

recipes-qt/qt5/qtxmlpatterns_git.bb +1 -1

index da2255a..98bab6e 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.

Signature · 7 lines

1.9.1

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Samuli Piippo

author

2015-08-25 07:20 UTC #8 lore raw

Re: [meta-qt5][PATCH 06/11] qt5: make qt5.inc reusable qt5-module.bbclass

Quoted 8 lines · Martin Jansa

Quoted 2 lines · Samuli Piippo
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

It can, but as a bblclass it would make it clear that it's a supported thing to do, like qmake5 currently is. And maybe help guide further changes so that it remains usable from other layers as well.

Quoted 420 lines

Quoted 417 lines

Signed-off-by Samuli Piippo <[email protected]>

---
  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%)

classes/qt5-module.bbclass renamed from recipes-qt/qt5/qt5.inc +0 -0

similarity index 100%
rename from recipes-qt/qt5/qt5.inc
rename to classes/qt5-module.bbclass

recipes-qt/examples/cinematicexperience_1.0.bb +1 -1

index 116127f..b1eee73 100644
@@ -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}

recipes-qt/examples/qt5everywheredemo_1.0.bb +1 -1

index 0546b00..b906741 100644
@@ -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}

recipes-qt/examples/qt5nmapcarousedemo_1.0.bb +1 -1

index 7edf727..67525ca 100644
@@ -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}

recipes-qt/examples/qt5nmapper_1.0.bb +1 -1

index 77cb067..cc61b18 100644
@@ -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}

recipes-qt/examples/qtsmarthome_1.0.bb +1 -1

index 944c4dc..3af01f4 100644
@@ -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}

recipes-qt/examples/quitbattery_1.0.0.bb +1 -1

index ea218d7..a8fb77d 100644
@@ -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}

recipes-qt/examples/quitindicators_1.0.1.bb +1 -1

index 19a861a..0377350 100644
@@ -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}

recipes-qt/libconnman-qt/libconnman-qt5_git.bb +1 -1

index f79dc0c..fcd7cbf 100644
@@ -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"

recipes-qt/qt5/qt3d_git.bb +1 -1

index 62f17e1..e658690 100644
@@ -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"

recipes-qt/qt5/qtbase_git.bb +1 -1

index 33620cb..92faf29 100644
@@ -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)"

recipes-qt/qt5/qtconnectivity_git.bb +1 -1

index c758d04..688d844 100644
@@ -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"

recipes-qt/qt5/qtdeclarative_git.bb +1 -1

index d186705..273891b 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
  require qt5-git.inc
 
  # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtenginio_git.bb +1 -1

index a0aff8f..2edc931 100644
@@ -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)"

recipes-qt/qt5/qtgraphicaleffects_git.bb +1 -1

index 9da5c94..0641f80 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
  require qt5-git.inc
 
  # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtimageformats_git.bb +1 -1

index 31d4fb0..17784c0 100644
@@ -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"

recipes-qt/qt5/qtlocation_git.bb +1 -1

index 12416bb..0264b93 100644
@@ -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"

recipes-qt/qt5/qtmultimedia_git.bb +1 -1

index bab9bee..abaa28f 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
  require qt5-git.inc
 
  # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtquick1_git.bb +1 -1

index 928963b..994d0bc 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
  require qt5-git.inc
 
  # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtquickcontrols_git.bb +1 -1

index af11119..769c191 100644
@@ -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"

recipes-qt/qt5/qtscript_git.bb +1 -1

index 5751e20..6c1c20c 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
  require qt5-git.inc
 
  # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtsensors_git.bb +1 -1

index ec33355..ee1f579 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
  require qt5-git.inc
 
  # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtserialport_git.bb +1 -1

index c59eef6..19748c2 100644
@@ -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

recipes-qt/qt5/qtsvg_git.bb +1 -1

index 1dce8c6..6350b38 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
  require qt5-git.inc
 
  # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtsystems_git.bb +1 -1

index edc0360..6bde2af 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
  require qt5-git.inc
 
  LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0"

recipes-qt/qt5/qttools_git.bb +1 -1

index a4f63c7..e27d6ef 100644
@@ -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)"

recipes-qt/qt5/qttranslations_git.bb +1 -1

index 9341453..75130b7 100644
@@ -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)"

recipes-qt/qt5/qtwayland_git.bb +1 -1

index 0be7afe..83cdbf4 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
  require qt5-git.inc
 
  # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtwebchannel_git.bb +1 -1

index 8433652..ce5f2fe 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
  require qt5-git.inc
 
  # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtwebengine_git.bb +1 -1

index 4b89ddd..3bd75af 100644
@@ -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

recipes-qt/qt5/qtwebkit-examples_git.bb +1 -1

index 5fd6436..f98dd63 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
  require qt5-git.inc
 
  # There are no LGPLv3-only licensed files in this component.

recipes-qt/qt5/qtwebkit_git.bb +1 -1

index db1a098..674d8ed 100644
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
  require qt5-git.inc
 
  LICENSE = "BSD & LGPLv2+ | GPL-2.0"

recipes-qt/qt5/qtwebsockets_git.bb +1 -1

index 85e9156..bd77d52 100644
@@ -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)"

recipes-qt/qt5/qtx11extras_git.bb +1 -1

index 6f60f2b..6428711 100644
@@ -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"

recipes-qt/qt5/qtxmlpatterns_git.bb +1 -2

index da2255a..98bab6e 100644
@@ -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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Samuli Piippo

2015-10-14 12:46 UTC #9 lore raw

Re: [meta-qt5][PATCH 06/11] qt5: make qt5.inc reusable qt5-module.bbclass

Quoted 7 lines · Samuli Piippo

Quoted 6 lines · Martin Jansa
Quoted 2 lines · Samuli Piippo
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

Quoted 8 lines

Quoted 2 lines
can be used in other layers as well
It can, but as a bblclass it would make it clear that it's a supported thing to do, like qmake5 currently is.
And maybe help guide further changes so that it remains usable from other layers as well.

Is this something that you can consider adding in? I'll do a rebase for it, if it is.

-samuli

Samuli Piippo

2015-10-14 12:49 UTC #10 lore raw

Re: [meta-qt5][PATCH 06/11] qt5: make qt5.inc reusable qt5-module.bbclass

In reply to Samuli Piippo

Quoted 7 lines · Samuli Piippo

Quoted 6 lines · Martin Jansa
Quoted 2 lines · Samuli Piippo
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

Quoted 8 lines

Quoted 2 lines
can be used in other layers as well
It can, but as a bblclass it would make it clear that it's a supported thing to do, like qmake5 currently is.
And maybe help guide further changes so that it remains usable from other layers as well.

Is this something that you can consider adding in? I'll do a rebase for it, if it is.

-samuli

Samuli Piippo

author

2015-08-24 09:28 UTC #11 lore raw

PATCH 7/11 qttools: use one recipe for all compilations

In reply to Samuli Piippo

Instead of separate recipes for target, native and nativesdk, use one recipe with BBCLASSEXTEND in place.

Signed-off-by Samuli Piippo <[email protected]>

---
 recipes-qt/qt5/nativesdk-qttools_git.bb | 45 ---------------------------------
 recipes-qt/qt5/qttools-native_git.bb    | 26 -------------------
 recipes-qt/qt5/qttools_git.bb           |  9 ++++++-
 3 files changed, 8 insertions(+), 72 deletions(-)
 delete mode 100644 recipes-qt/qt5/nativesdk-qttools_git.bb
 delete mode 100644 recipes-qt/qt5/qttools-native_git.bb

recipes-qt/qt5/nativesdk-qttools_git.bb deleted +0 ~~-45~~

deleted file mode 100644
index 73e5d22..0000000
@@ -1,45 +0,0 @@
-LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \
-    file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \
-    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-"
-
-QT_MODULE = "qttools"
-
-DEPENDS = "nativesdk-qtbase qtbase-native"
-
-require nativesdk-qt5.inc
-require qt5-git.inc
-
-# it's already included with newer oe-core, but include it here for dylan
-FILESEXTRAPATHS =. "${FILE_DIRNAME}/qttools:"
-
-SRC_URI += "file://0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch"
-
-PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
-
-FILES_${PN}-dbg = " \
-    ${OE_QMAKE_PATH_BINS}/.debug \
-"
-
-FILES_${PN} = " \
-    ${OE_QMAKE_PATH_BINS}/* \
-"
-
-do_configure() {
-    ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} CONFIG+=linguistonly
-}
-
-do_install() {
-    # Fix install paths for all
-    find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_HOST},(INSTALL_ROOT),g"
-
-    oe_runmake install INSTALL_ROOT=${D}
-
-    # remove things unused in nativesdk
-    rm -rf ${D}${libdir}
-}
-
-SRCREV = "a6ed9b418d1b4464f088b378e5bdb96ec420db6c"

recipes-qt/qt5/qttools-native_git.bb deleted +0 ~~-26~~

deleted file mode 100644
index 13e1b79..0000000
@@ -1,26 +0,0 @@
-DEPENDS = "qtbase-native"
-
-LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \
-    file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \
-    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-"
-
-QT_MODULE = "qttools"
-
-require qt5-native.inc
-require qt5-git.inc
-
-SRC_URI += "file://0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch"
-
-do_configure() {
-    ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} CONFIG+=linguistonly
-}
-
-do_install() {
-    oe_runmake install INSTALL_ROOT=${D}
-}
-
-SRCREV = "a6ed9b418d1b4464f088b378e5bdb96ec420db6c"

recipes-qt/qt5/qttools_git.bb +8 -1

index e27d6ef..51690ac 100644
@@ -9,9 +9,11 @@ LIC_FILES_CHKSUM = " \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 "
 
-DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
+DEPENDS += "qtbase"
+DEPENDS_class-target = "qtdeclarative qtxmlpatterns"
 
 SRC_URI += " \
+    file://0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch \
     file://0002-assistant-help-fix-linking-of-dependent-libraries.patch \
     file://0003-add-noqtwebkit-configuration.patch \
 "

@@ -24,4 +26,9 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
 
 EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
 
+EXTRA_QMAKEVARS_PRE_class-native += "CONFIG+=linguistonly"
+EXTRA_QMAKEVARS_PRE_class-nativesdk += "CONFIG+=linguistonly"
+
 SRCREV = "a6ed9b418d1b4464f088b378e5bdb96ec420db6c"
+
+BBCLASSEXTEND = "native nativesdk"

Signature · 1 line

1.9.1

Martin Jansa

2015-08-24 12:46 UTC #12 lore raw

Re: [meta-qt5][PATCH 07/11] qttools: use one recipe for all compilations

Quoted 113 lines · Samuli Piippo

Instead of separate recipes for target, native and nativesdk, use one recipe with BBCLASSEXTEND in place.

Signed-off-by Samuli Piippo <[email protected]>

---
 recipes-qt/qt5/nativesdk-qttools_git.bb | 45 ---------------------------------
 recipes-qt/qt5/qttools-native_git.bb    | 26 -------------------
 recipes-qt/qt5/qttools_git.bb           |  9 ++++++-
 3 files changed, 8 insertions(+), 72 deletions(-)
 delete mode 100644 recipes-qt/qt5/nativesdk-qttools_git.bb
 delete mode 100644 recipes-qt/qt5/qttools-native_git.bb

recipes-qt/qt5/nativesdk-qttools_git.bb deleted +0 ~~-45~~

deleted file mode 100644
index 73e5d22..0000000
@@ -1,45 +0,0 @@
-LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \
-    file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \
-    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-"
-
-QT_MODULE = "qttools"
-
-DEPENDS = "nativesdk-qtbase qtbase-native"
-
-require nativesdk-qt5.inc
-require qt5-git.inc
-
-# it's already included with newer oe-core, but include it here for dylan
-FILESEXTRAPATHS =. "${FILE_DIRNAME}/qttools:"
-
-SRC_URI += "file://0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch"
-
-PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
-
-FILES_${PN}-dbg = " \
-    ${OE_QMAKE_PATH_BINS}/.debug \
-"
-
-FILES_${PN} = " \
-    ${OE_QMAKE_PATH_BINS}/* \
-"
-
-do_configure() {
-    ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} CONFIG+=linguistonly
-}
-
-do_install() {
-    # Fix install paths for all
-    find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_HOST},(INSTALL_ROOT),g"
-
-    oe_runmake install INSTALL_ROOT=${D}
-
-    # remove things unused in nativesdk
-    rm -rf ${D}${libdir}
-}
-
-SRCREV = "a6ed9b418d1b4464f088b378e5bdb96ec420db6c"

recipes-qt/qt5/qttools-native_git.bb deleted +0 ~~-26~~

deleted file mode 100644
index 13e1b79..0000000
@@ -1,26 +0,0 @@
-DEPENDS = "qtbase-native"
-
-LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \
-    file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \
-    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-"
-
-QT_MODULE = "qttools"
-
-require qt5-native.inc
-require qt5-git.inc
-
-SRC_URI += "file://0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch"
-
-do_configure() {
-    ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} CONFIG+=linguistonly
-}
-
-do_install() {
-    oe_runmake install INSTALL_ROOT=${D}
-}
-
-SRCREV = "a6ed9b418d1b4464f088b378e5bdb96ec420db6c"

recipes-qt/qt5/qttools_git.bb +3 -1

index e27d6ef..51690ac 100644
@@ -9,9 +9,11 @@ LIC_FILES_CHKSUM = " \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 "
 
-DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
+DEPENDS += "qtbase"
+DEPENDS_class-target = "qtdeclarative qtxmlpatterns"
 
 SRC_URI += " \
+    file://0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch \
     file://0002-assistant-help-fix-linking-of-dependent-libraries.patch \
     file://0003-add-noqtwebkit-configuration.patch \
 "

recipes-qt/qt5/qttools_git.bb PACKAGECONFIG[qtwebkit] = ",,qtwebkit" · line 30

Quoted 5 lines

recipes-qt/qt5/qttools_git.bb +2 -0

@@ -24,4 +26,9 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
 
 EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
 
+EXTRA_QMAKEVARS_PRE_class-native += "CONFIG+=linguistonly"
+EXTRA_QMAKEVARS_PRE_class-nativesdk += "CONFIG+=linguistonly"

Use PACKAGECONFIG to restrict native and nativesdk builds to linguistonly.

Quoted 12 lines

recipes-qt/qt5/qttools_git.bb +3 -0

+
 SRCREV = "a6ed9b418d1b4464f088b378e5bdb96ec420db6c"
+
+BBCLASSEXTEND = "native nativesdk"

Signature · 7 lines

1.9.1

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Samuli Piippo

author

2015-08-24 09:28 UTC #13 lore raw

PATCH 8/11 qtbase: remove dependency to sqlite

In reply to Samuli Piippo

Qt defaults to bundled version of sqlite, so there is no need to have dependency to sqlite3.

Signed-off-by Samuli Piippo <[email protected]>

---
 recipes-qt/qt5/qtbase_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

recipes-qt/qt5/qtbase_git.bb +1 -1

index 92faf29..972027b 100644
@@ -101,7 +101,7 @@ PACKAGECONFIG[sql-oci] = "-sql-oci,-no-sql-oci"
 PACKAGECONFIG[sql-tds] = "-sql-tds,-no-sql-tds"
 PACKAGECONFIG[sql-db2] = "-sql-db2,-no-sql-db2"
 PACKAGECONFIG[sql-sqlite2] = "-sql-sqlite2,-no-sql-sqlite2,sqlite"
-PACKAGECONFIG[sql-sqlite] = "-sql-sqlite,-no-sql-sqlite,sqlite3"
+PACKAGECONFIG[sql-sqlite] = "-sql-sqlite,-no-sql-sqlite,"
 PACKAGECONFIG[xcursor] = "-xcursor,-no-xcursor,libxcursor"
 PACKAGECONFIG[xinerama] = "-xinerama,-no-xinerama,libxinerama"
 PACKAGECONFIG[xinput] = "-xinput,-no-xinput"

Signature · 1 line

1.9.1

Samuli Piippo

author

2015-08-24 09:28 UTC #14 lore raw

PATCH 9/11 qtbase: PACKAGECONFIGs for libproxy and libinput

In reply to Samuli Piippo

Signed-off-by Samuli Piippo <[email protected]>

---
 recipes-qt/qt5/qtbase_git.bb | 2 ++
 1 file changed, 2 insertions(+)

recipes-qt/qt5/qtbase_git.bb +2 -0

index 972027b..dcda92f 100644
@@ -133,6 +133,8 @@ PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib"
 PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio"
 PACKAGECONFIG[nis] = "-nis,-no-nis"
 PACKAGECONFIG[widgets] = "-widgets,-no-widgets"
+PACKAGECONFIG[libproxy] = "-libproxy,-no-libproxy,libproxy"
+PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput"
 
 QT_CONFIG_FLAGS += " \
     -shared \

Signature · 1 line

1.9.1

Samuli Piippo

author

2015-08-24 09:29 UTC #15 lore raw

PATCH 10/11 qtlocation: use correct dependencies

In reply to Samuli Piippo

Update dependencies for QtLocation module based on the sync.profile

Signed-off-by Samuli Piippo <[email protected]>

---
 recipes-qt/qt5/qtlocation_git.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

recipes-qt/qt5/qtlocation_git.bb +1 -2

index 0264b93..c7773f2 100644
@@ -10,8 +10,7 @@ LIC_FILES_CHKSUM = " \
     file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \
 "
 
-DEPENDS += "qtbase qt3d"
-# qtsystems qtmultimedia
+DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols"
 
 PACKAGECONFIG ??= ""
 # older geoclue 0.x is needed

Signature · 1 line

1.9.1

Samuli Piippo

author

2015-08-24 09:28 UTC #16 lore raw

PATCH 11/11 qtwebengine: fix problem with recursive qmake call

In reply to Samuli Piippo

On RaspberryPi, the EGL include paths were not included in the generated ninja build files, because the pro files were run in wrong order. Fix the order, but remove compiler overrides, as they would break the build again.

Signed-off-by Samuli Piippo <[email protected]>

---
 .../0005-Generate-usable-qmake_extras.gypi.patch   | 71 ++++++++++++++++++++++
 recipes-qt/qt5/qtwebengine_git.bb                  |  1 +
 2 files changed, 72 insertions(+)
 create mode 100644 recipes-qt/qt5/qtwebengine/0005-Generate-usable-qmake_extras.gypi.patch

recipes-qt/qt5/qtwebengine/0005-Generate-usable-qmake_extras.gypi.patch new file +71 -0

new file mode 100644
index 0000000..89f56e0
@@ -0,0 +1,71 @@
+From 9d2fafdd9a15adf51d8383bdd545d73e76ad0428 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <[email protected]>
+Date: Mon, 11 May 2015 13:47:06 +0300
+Subject: [PATCH] Generate usable qmake_extras.gypi
+
+Running qmake recursively does not take .depends into account, so
+the SUBDIRS need to be in correct order so that qmake_extras.gypi
+is used for the ninja files. Do no try to write compiler tools as
+it will break the build.
+
+Task-number: QTBUG-45706
+Upstream-Status: Pending
+---
+ src/core/core.pro                 | 7 ++++---
+ src/core/gyp_configure_host.pro   | 3 ---
+ src/core/gyp_configure_target.pro | 3 ---
+ 3 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/src/core/core.pro b/src/core/core.pro
+index cf00f39..747b711 100644
+--- a/src/core/core.pro
++++ b/src/core/core.pro
+@@ -12,9 +12,7 @@ gyp_run.depends = core_gyp_generator
+ core_module.file = core_module.pro
+ core_module.depends = gyp_run
+ 
+-SUBDIRS += core_gyp_generator \
+-           gyp_run \
+-           core_module
++SUBDIRS += core_gyp_generator
+ 
+ !win32 {
+     # gyp_configure_host.pro and gyp_configure_target.pro are phony pro files that
+@@ -28,3 +26,6 @@ SUBDIRS += core_gyp_generator \
+     gyp_run.depends += gyp_configure_host gyp_configure_target
+     SUBDIRS += gyp_configure_host gyp_configure_target
+ }
++
++SUBDIRS += gyp_run \
++           core_module
+diff --git a/src/core/gyp_configure_host.pro b/src/core/gyp_configure_host.pro
+index 3eb6738..d6820c4 100644
+--- a/src/core/gyp_configure_host.pro
++++ b/src/core/gyp_configure_host.pro
+@@ -6,9 +6,6 @@ option(host_build)
+ 
+ GYPI_CONTENTS = "{" \
+                 "  'make_global_settings': [" \
+-                "    ['CC.host', '$$which($$QMAKE_CC)']," \
+-                "    ['CXX.host', '$$which($$QMAKE_CXX)']," \
+-                "    ['LD.host', '$$which($$QMAKE_LINK)'],"
+ 
+ GYPI_FILE = $$absolute_path('qmake_extras.gypi')
+ !build_pass {
+diff --git a/src/core/gyp_configure_target.pro b/src/core/gyp_configure_target.pro
+index 4d52044..f02bfa0 100644
+--- a/src/core/gyp_configure_target.pro
++++ b/src/core/gyp_configure_target.pro
+@@ -3,9 +3,6 @@ TEMPLATE = aux
+ 
+ TOOLCHAIN_INCLUDES = $${QMAKE_INCDIR_EGL} $${INCLUDEPATH} $${QMAKE_INCDIR}
+ 
+-GYPI_CONTENTS += "    ['CC', '$$which($$QMAKE_CC)']," \
+-                 "    ['CXX', '$$which($$QMAKE_CXX)']," \
+-                 "    ['LD', '$$which($$QMAKE_LINK)'],"
+ GYPI_CONTENTS += "  ]," \
+                  "  'target_defaults': {" \
+                  "    'target_conditions': [" \
+-- 
+1.9.1
+

recipes-qt/qt5/qtwebengine_git.bb +1 -0

index 3bd75af..659fb56 100644
@@ -80,6 +80,7 @@ SRC_URI += " \
     file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \
     file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \
     file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \
+    file://0005-Generate-usable-qmake_extras.gypi.patch \
 "
 SRCREV_qtwebengine = "55a7fc7651136510032166ff24eb5e7e49635145"
 SRCREV_chromium = "140893bef70011645c686f5fabe45018dd2e392a"

Signature · 1 line

1.9.1

Martin Jansa

2015-08-24 12:41 UTC #17 lore raw

In reply to Samuli Piippo

Quoted 4 lines · Samuli Piippo

As part of Qt for Device Creation [1], we are starting to use meta-qt5 layer when creating images for our supported devices. We have done number of changes to the layer when intergrating it with our internal layer. We would now like to upstream those changes.

I've just merged upgrade to 5.5 can you please rebase your changes and re-submit?

Thanks

Quoted 81 lines

[1] https://www.qt.io/qt-for-device-creation

The following changes since commit d2c05c81e8230358dca80cf9df67e49f9f672a29:

libconnman-qt5: update to 1.0.91 (2015-07-31 16:23:35 +0200)

are available in the git repository at:

git://github.com/sapiippo/meta-qt5 master
https://github.com/sapiippo/meta-qt5/tree/master

 classes/populate_sdk_qt5.bbclass                   | 11 +---
 classes/qmake5.bbclass                             |  8 +++
 classes/qmake5_base.bbclass                        | 11 ++++
 .../qt5/qt5.inc => classes/qt5-module.bbclass      | 38 +++++++++++-
 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/meta/meta-toolchain-qt5.bb              |  4 ++
 recipes-qt/qt5/nativesdk-qttools_git.bb            | 45 --------------
 recipes-qt/qt5/qt3d_git.bb                         |  2 +-
 recipes-qt/qt5/qtbase_git.bb                       |  6 +-
 recipes-qt/qt5/qtconnectivity_git.bb               |  2 +-
 recipes-qt/qt5/qtdeclarative_git.bb                |  4 +-
 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                   |  5 +-
 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-native_git.bb               | 26 --------
 recipes-qt/qt5/qttools_git.bb                      | 11 +++-
 recipes-qt/qt5/qttranslations_git.bb               |  2 +-
 recipes-qt/qt5/qtwayland_git.bb                    |  2 +-
 recipes-qt/qt5/qtwebchannel_git.bb                 |  2 +-
 .../0005-Generate-usable-qmake_extras.gypi.patch   | 71 ++++++++++++++++++++++
 recipes-qt/qt5/qtwebengine_git.bb                  |  3 +-
 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                |  4 +-
 42 files changed, 183 insertions(+), 120 deletions(-)
 rename recipes-qt/qt5/qt5.inc => classes/qt5-module.bbclass (86%)
 delete mode 100644 recipes-qt/qt5/nativesdk-qttools_git.bb
 delete mode 100644 recipes-qt/qt5/qttools-native_git.bb
 create mode 100644 recipes-qt/qt5/qtwebengine/0005-Generate-usable-qmake_extras.gypi.patch

Signature · 7 lines

1.9.1

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]