meta-toolchain-qte: Append to the toolchain env script and remove code duplication

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-qt/meta/meta-toolchain-qte.bb b/meta/recipes-qt/meta/meta-toolchain-qte.bb
index b57369a937e5f1e69895ecdeb8735e68695b4912..da0dda77c9a8a53266487ee0d457f50cf3c635c3 100644 (file)
--- a/meta/recipes-qt/meta/meta-toolchain-qte.bb
+++ b/meta/recipes-qt/meta/meta-toolchain-qte.bb
@@ -8,9 +8,7 @@ SDK_SUFFIX = "toolchain-qte"
 
 QT_DIR_NAME = "qtopia"
 
-do_populate_sdk_append() {
-    script="${SDK_OUTPUT}/${SDKPATH}/environment-setup"
-    touch $script
+toolchain_create_sdk_env_script_append() {
     echo 'export OE_QMAKE_CC=${TARGET_SYS}-gcc' >> $script
     echo 'export OE_QMAKE_CXX=${TARGET_SYS}-g++' >> $script
     echo 'export OE_QMAKE_LINK=${TARGET_SYS}-g++' >> $script
@@ -25,8 +23,4 @@ do_populate_sdk_append() {
     echo 'export OE_QMAKE_QDBUSXML2CPP=${SDKPATH}/bin/qdbusxml2cpp4' >> $script
     echo 'export OE_QMAKE_QT_CONFIG=${SDKPATH}/${TARGET_SYS}/${datadir}/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script
     echo 'export QMAKESPEC=${SDKPATH}/${TARGET_SYS}/${datadir}/${QT_DIR_NAME}/mkspecs/linux-g++' >> $script
-
-    # Repack SDK with new environment-setup
-    cd ${SDK_OUTPUT}
-    tar --owner=root --group=root -cj --file=${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 .
 }