summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-17 12:00:50 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-17 12:00:50 +0000
commita78d298e8e41e47b68a8204d03bba2540a24953e (patch)
treeb2a2f45f191c65d74868973fc115e32714957ea1
parent7d9e2e530ed732967924294c9616841a059e5c24 (diff)
downloadopenembedded-core-a78d298e8e41e47b68a8204d03bba2540a24953e.tar.gz
openembedded-core-a78d298e8e41e47b68a8204d03bba2540a24953e.tar.bz2
openembedded-core-a78d298e8e41e47b68a8204d03bba2540a24953e.zip
qmake2-cross: Use do_install for staging
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/qmake/qmake2-cross_2.10a.bb23
1 files changed, 13 insertions, 10 deletions
diff --git a/meta/packages/qmake/qmake2-cross_2.10a.bb b/meta/packages/qmake/qmake2-cross_2.10a.bb
index 5f1c020bce..b8b73c12d8 100644
--- a/meta/packages/qmake/qmake2-cross_2.10a.bb
+++ b/meta/packages/qmake/qmake2-cross_2.10a.bb
@@ -54,16 +54,19 @@ do_compile() {
:
}
-do_stage() {
- install -d ${CROSS_BINDIR}/
- install -m 0755 bin/qmake ${CROSS_BINDIR}/qmake2
- install -m 0755 bin/qmake ${CROSS_BINDIR}/qmake-qt4
- install -d ${STAGING_DIR}/${CROSS_SYS}/qt4/
- cp -PfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/
- install -d ${STAGING_DIR}/${HOST_SYS}/qt4/
- cp -PfR mkspecs ${STAGING_DIR}/${HOST_SYS}/qt4/
+do_install() {
+ install -d ${D}${CROSS_BINDIR}/
+ install -m 0755 bin/qmake ${D}${CROSS_BINDIR}/qmake2
+ install -m 0755 bin/qmake ${D}${CROSS_BINDIR}/qmake-qt4
+ install -d ${D}${STAGING_DIR}/${CROSS_SYS}/qt4/
+ cp -PfR mkspecs ${D}${STAGING_DIR}/${CROSS_SYS}/qt4/
+ install -d ${D}${STAGING_DIR}/${HOST_SYS}/qt4/
+ cp -PfR mkspecs ${D}${STAGING_DIR}/${HOST_SYS}/qt4/
}
-do_install() {
- :
+sysroot_stage_all_append() {
+ sysroot_stage_dir ${D}/${STAGING_DIR_NATIVE}/qt4 ${SYSROOT_DESTDIR}/${STAGING_DIR_NATIVE}/qt4
+ sysroot_stage_dir ${D}/${STAGING_DIR_TARGET}/qt4 ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/qt4
}
+
+