[oe] [meta-qt5][PATCH v2 01/11] qt5: make populate_sdk_qt5 reusable

Samuli Piippo samuli.piippo at theqtcompany.com
Tue Aug 25 11:43:43 UTC 2015


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 <samuli.piippo at theqtcompany.com>
---
 classes/populate_sdk_qt5.bbclass      | 5 -----
 recipes-qt/meta/meta-toolchain-qt5.bb | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/classes/populate_sdk_qt5.bbclass b/classes/populate_sdk_qt5.bbclass
index 79df489..d29ec36 100644
--- a/classes/populate_sdk_qt5.bbclass
+++ b/classes/populate_sdk_qt5.bbclass
@@ -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"
diff --git a/recipes-qt/meta/meta-toolchain-qt5.bb b/recipes-qt/meta/meta-toolchain-qt5.bb
index 8991176..11b7962 100644
--- a/recipes-qt/meta/meta-toolchain-qt5.bb
+++ b/recipes-qt/meta/meta-toolchain-qt5.bb
@@ -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"
-- 
1.9.1




More information about the Openembedded-devel mailing list