[oe-commits] Koen Kooi : qt4-tools-native: convert to new style staging
git version control
git at git.openembedded.org
Mon Apr 19 20:29:14 UTC 2010
Module: openembedded.git
Branch: shr/unstable
Commit: bdffb75d4b09b554a9f5dfe51ec169182511079d
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=bdffb75d4b09b554a9f5dfe51ec169182511079d
Author: Koen Kooi <koen at openembedded.org>
Date: Sat Apr 17 19:42:09 2010 +0200
qt4-tools-native: convert to new style staging
---
recipes/qt4/qt4-tools-native.inc | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/recipes/qt4/qt4-tools-native.inc b/recipes/qt4/qt4-tools-native.inc
index bd0d2e1..9bfffe3 100644
--- a/recipes/qt4/qt4-tools-native.inc
+++ b/recipes/qt4/qt4-tools-native.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com"
PRIORITY = "optional"
LICENSE = "GPL"
-INC_PR = "r6"
+INC_PR = "r7"
inherit native
@@ -59,17 +59,19 @@ do_compile() {
done
}
-do_stage() {
- install -d ${STAGING_BINDIR_NATIVE}/
- install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake2
+NATIVE_INSTALL_WORKS = "1"
+
+do_install() {
+ install -d ${D}${bindir}/
+ install -m 0755 bin/qmake ${D}${bindir}/qmake2
for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do
- install -m 0755 bin/${i} ${STAGING_BINDIR_NATIVE}/${i}4
+ install -m 0755 bin/${i} ${D}${bindir}/${i}4
done
- install -d ${STAGING_DATADIR_NATIVE}/qt4/
- cp -PfR mkspecs ${STAGING_DATADIR_NATIVE}/qt4/
- ln -sf linux-g++ ${STAGING_DATADIR_NATIVE}/qt4/mkspecs/${BUILD_OS}-oe-g++
- cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf ${STAGING_DATADIR_NATIVE}/qt4/mkspecs/common/
+ install -d ${D}${datadir}/qt4/
+ cp -PfR mkspecs ${D}${datadir}/qt4/
+ ln -sf linux-g++ ${D}${datadir}/qt4/mkspecs/${BUILD_OS}-oe-g++
+ cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf ${D}${datadir}/qt4/mkspecs/common/
- install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DATADIR_NATIVE}/qt4/
+ install -m 0644 tools/porting/src/q3porting.xml ${D}${datadir}/qt4/
}
More information about the Openembedded-commits
mailing list