[oe] [PATCH 1/2] uicmoc4-native.inc: Convert to new style staging, Remove do_stage()
Noor Ahsan
noor_ahsan at mentor.com
Mon Aug 23 10:28:51 UTC 2010
* Converted do_stage to do_install
* Replaced ${STAGING_BINDIR} with ${D}${bindir}
* ${STAGING_DIR_NATIVE} with ${D}${datadir} as q3porting.xml is placed in share directory when we install this package on host.
* Replaced some tabs with spaces.
* Bump PR to "r2"
Signed-off-by: Noor Ahsan <nahsan at pkl-nahsan-ubuntu.(none)>
---
recipes/uicmoc/uicmoc4-native.inc | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/recipes/uicmoc/uicmoc4-native.inc b/recipes/uicmoc/uicmoc4-native.inc
index 1124226..a0ba2cd 100644
--- a/recipes/uicmoc/uicmoc4-native.inc
+++ b/recipes/uicmoc/uicmoc4-native.inc
@@ -4,7 +4,7 @@ SECTION = "libs"
HOMEPAGE = "http://www.trolltech.com"
PRIORITY = "optional"
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
file://configure-fix.patch"
@@ -59,19 +59,19 @@ do_compile() {
for i in ${TOBUILD2};
do
cd ${S}/$i && \
- ${S}/bin/qmake -spec ${S}/mkspecs/linux-g++ && \
- oe_runmake CC="${CC}" CXX="${CXX}"
+ ${S}/bin/qmake -spec ${S}/mkspecs/linux-g++ && \
+ oe_runmake CC="${CC}" CXX="${CXX}"
done
}
-do_stage() {
- install -d ${STAGING_BINDIR}/
- install -m 0755 bin/moc ${STAGING_BINDIR}/moc4
- install -m 0755 bin/uic ${STAGING_BINDIR}/uic4
- install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34
- install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4
- install -m 0755 bin/lrelease ${STAGING_BINDIR}/lrelease4
- install -m 0755 bin/lupdate ${STAGING_BINDIR}/lupdate4
- install -d ${STAGING_DIR_NATIVE}/qt4/
- install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR_NATIVE}/qt4/
+do_install() {
+ install -d ${D}${bindir}/
+ install -m 0755 bin/moc ${D}${bindir}/moc4
+ install -m 0755 bin/uic ${D}${bindir}/uic4
+ install -m 0755 bin/uic3 ${D}${bindir}/uic34
+ install -m 0755 bin/rcc ${D}${bindir}/rcc4
+ install -m 0755 bin/lrelease ${D}${bindir}/lrelease4
+ install -m 0755 bin/lupdate ${D}${bindir}/lupdate4
+ install -d ${D}${datadir}/qt4/
+ install -m 0644 tools/porting/src/q3porting.xml ${D}${datadir}/qt4/
}
--
1.6.3.3
More information about the Openembedded-devel
mailing list