On 30.08.2015 15:49, Jonathan Liu wrote:
On 25/08/2015 9:43 PM, Samuli Piippo wrote:
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(-)
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"
If someone had already copied meta-toolchain-qt5 into their own layer
and modified it, this would be a breaking change for them as they need
to make the same changes in their own toolchain recipe. I wonder if it
would be better if the reusable part of populate_sdk_qt5.bbclass was
split off into populate_sdk_qt5_base.bbclass instead and inherited by
populate_sdk_qt5.bbclass.
Regards,
Jonathan
That sounds reasonable to me.
-samuli
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
