[oe-commits] Andrea Adami : libqpe-opie: remove superfluous do_stage (). Bump PR.
git version control
git at git.openembedded.org
Mon Oct 11 22:25:01 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 0cb515879ab62d805b3ec712dfd9748e994263ac
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=0cb515879ab62d805b3ec712dfd9748e994263ac
Author: Andrea Adami <andrea.adami at gmail.com>
Date: Mon Oct 11 23:54:45 2010 +0200
libqpe-opie: remove superfluous do_stage (). Bump PR.
---
recipes/libqpe/libqpe-opie.inc | 63 ++++++++++++++++-------------------
recipes/libqpe/libqpe-opie_1.2.3.bb | 1 -
recipes/libqpe/libqpe-opie_1.2.4.bb | 2 +-
3 files changed, 30 insertions(+), 36 deletions(-)
diff --git a/recipes/libqpe/libqpe-opie.inc b/recipes/libqpe/libqpe-opie.inc
index 5795e5c..b3b78a3 100644
--- a/recipes/libqpe/libqpe-opie.inc
+++ b/recipes/libqpe/libqpe-opie.inc
@@ -6,7 +6,7 @@ PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "uicmoc-native virtual/libqte2"
PROVIDES = "virtual/libqpe1"
-INC_PR = "r7"
+INC_PR = "r8"
S = "${WORKDIR}/library"
inherit palmtop
@@ -24,44 +24,39 @@ do_compile() {
${STAGING_INCDIR}/opie \
${STAGING_INCDIR}/opie2 \
${STAGING_INCDIR}/qtopia/private
- for i in ${S}/*.h
- do
- install -m 0644 $i ${STAGING_INCDIR}/qpe/`basename $i`
- install -m 0644 $i ${STAGING_INCDIR}/qtopia/`basename $i`
- install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i`
- done
- for i in ${S}/backend/*.h
- do
- install -m 0644 $i ${STAGING_INCDIR}/qpe/`basename $i`
- install -m 0644 $i ${STAGING_INCDIR}/qtopia/`basename $i`
- install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i`
- done
- rm -f ${STAGING_INCDIR}/qtopia/*_p.h # remove private stuff out of qtopia
- oe_runmake MOC=${STAGING_BINDIR_NATIVE}/moc UIC=${STAGING_BINDIR_NATIVE}/uic
-}
-
-do_stage() {
- oe_libinstall -so libqpe ${STAGING_LIBDIR}
- # include files already done during do_compile
+ for i in ${S}/*.h
+ do
+ install -m 0644 $i ${STAGING_INCDIR}/qpe/`basename $i`
+ install -m 0644 $i ${STAGING_INCDIR}/qtopia/`basename $i`
+ install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i`
+ done
+ for i in ${S}/backend/*.h
+ do
+ install -m 0644 $i ${STAGING_INCDIR}/qpe/`basename $i`
+ install -m 0644 $i ${STAGING_INCDIR}/qtopia/`basename $i`
+ install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i`
+ done
+ rm -f ${STAGING_INCDIR}/qtopia/*_p.h # remove private stuff out of qtopia
+ oe_runmake MOC=${STAGING_BINDIR_NATIVE}/moc UIC=${STAGING_BINDIR_NATIVE}/uic
}
do_install() {
- oe_libinstall -so libqpe ${D}${libdir}
+ oe_libinstall -so libqpe ${D}${libdir}
install -d ${D}${includedir}/qpe \
${D}${includedir}/qtopia/private
- for i in ${S}/*.h
- do
- install -m 0644 $i ${D}${includedir}/qpe/`basename $i`
- install -m 0644 $i ${D}${includedir}/qtopia/`basename $i`
- install -m 0644 $i ${D}${includedir}/qtopia/private/`basename $i`
- done
- for i in ${S}/backend/*.h
- do
- install -m 0644 $i ${D}${includedir}/qpe/`basename $i`
- install -m 0644 $i ${D}${includedir}/qtopia/`basename $i`
- install -m 0644 $i ${D}${includedir}/qtopia/private/`basename $i`
- done
- rm -f ${D}${includedir}/qtopia/*_p.h # remove private stuff out of qtopia
+ for i in ${S}/*.h
+ do
+ install -m 0644 $i ${D}${includedir}/qpe/`basename $i`
+ install -m 0644 $i ${D}${includedir}/qtopia/`basename $i`
+ install -m 0644 $i ${D}${includedir}/qtopia/private/`basename $i`
+ done
+ for i in ${S}/backend/*.h
+ do
+ install -m 0644 $i ${D}${includedir}/qpe/`basename $i`
+ install -m 0644 $i ${D}${includedir}/qtopia/`basename $i`
+ install -m 0644 $i ${D}${includedir}/qtopia/private/`basename $i`
+ done
+ rm -f ${D}${includedir}/qtopia/*_p.h # remove private stuff out of qtopia
}
diff --git a/recipes/libqpe/libqpe-opie_1.2.3.bb b/recipes/libqpe/libqpe-opie_1.2.3.bb
index 2b50fca..323bc62 100644
--- a/recipes/libqpe/libqpe-opie_1.2.3.bb
+++ b/recipes/libqpe/libqpe-opie_1.2.3.bb
@@ -9,4 +9,3 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
file://citytime-path.patch \
file://fix-sd-card-path.patch \
"
-
diff --git a/recipes/libqpe/libqpe-opie_1.2.4.bb b/recipes/libqpe/libqpe-opie_1.2.4.bb
index 7c4e231..26414d3 100644
--- a/recipes/libqpe/libqpe-opie_1.2.4.bb
+++ b/recipes/libqpe/libqpe-opie_1.2.4.bb
@@ -9,6 +9,6 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
file://citytime-path-2.patch \
file://no-include-pro.patch \
file://unhide_lnkproperties_destructor.patch \
- file://double_name.patch \
+ file://double_name.patch \
"
More information about the Openembedded-commits
mailing list