]> code.ossystems Code Review - openembedded-core.git/commitdiff
qmake2-cross: Use do_install for staging
authorRichard Purdie <rpurdie@linux.intel.com>
Tue, 17 Nov 2009 12:00:50 +0000 (12:00 +0000)
committerRichard Purdie <rpurdie@linux.intel.com>
Tue, 17 Nov 2009 12:00:50 +0000 (12:00 +0000)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
meta/packages/qmake/qmake2-cross_2.10a.bb

index 5f1c020bce0615428d85a1c6a81d183efc9dd409..b8b73c12d87381beda18ed5f34aa1915086cc470 100644 (file)
@@ -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
 }
+
+