summaryrefslogtreecommitdiff
path: root/recipes
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2009-12-20 23:02:25 -0800
committerKhem Raj <raj.khem@gmail.com>2009-12-20 23:02:25 -0800
commit9d53afeb98e6c6319a3b5ee0056121b547b5be4f (patch)
tree4b2a282b8caf0dd98555302db8eccf53a2e261f5 /recipes
parent3a6620343a492559956348a6876ae7b766b42725 (diff)
libqpe-opie: Dont inherit opie.
* inhetriting opie caused other problems like circular dependencies in do_stage task etc. therefore dont inherit opie just to get a variable instead define the variable here. * Add a note about the above in the cvs recipe so in future updates happens correctly. Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes')
-rw-r--r--recipes/libqpe/libqpe-opie.inc1
-rw-r--r--recipes/libqpe/libqpe-opie_cvs.bb6
2 files changed, 6 insertions, 1 deletions
diff --git a/recipes/libqpe/libqpe-opie.inc b/recipes/libqpe/libqpe-opie.inc
index 3cecedd071..5795e5c765 100644
--- a/recipes/libqpe/libqpe-opie.inc
+++ b/recipes/libqpe/libqpe-opie.inc
@@ -10,7 +10,6 @@ INC_PR = "r7"
S = "${WORKDIR}/library"
inherit palmtop
-inherit opie
OE_QMAKE_CXXFLAGS := "${@oe_filter_out('-fno-rtti', '${OE_QMAKE_CXXFLAGS}', d)}"
QMAKE_PROFILES = "library.pro"
diff --git a/recipes/libqpe/libqpe-opie_cvs.bb b/recipes/libqpe/libqpe-opie_cvs.bb
index 8ed2f4d88b..16b6414759 100644
--- a/recipes/libqpe/libqpe-opie_cvs.bb
+++ b/recipes/libqpe/libqpe-opie_cvs.bb
@@ -1,5 +1,11 @@
require ${PN}.inc
+# OPIE_CVS_PV is defined in opie.bbclass
+# but this recipe does not inherit opie
+# so any updates to OPIE_CVS_PV should happen
+# in both places.
+
+OPIE_CVS_PV ?= "1.2.2+cvs${SRCDATE}"
PV = "${OPIE_CVS_PV}"
PR = "${INC_PR}.0"