From 6855e395d3277f7040a45148b0d8f25ff74eeea2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 10 Dec 2009 12:52:32 -0800 Subject: libqpe-opie: inherit opie for OPIE_CVS_PV * Move to using INC_PR. Signed-off-by: Khem Raj --- recipes/libqpe/libqpe-opie.inc | 3 ++- recipes/libqpe/libqpe-opie_1.2.2.bb | 2 +- recipes/libqpe/libqpe-opie_1.2.3.bb | 2 +- recipes/libqpe/libqpe-opie_1.2.4.bb | 2 +- recipes/libqpe/libqpe-opie_cvs.bb | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/recipes/libqpe/libqpe-opie.inc b/recipes/libqpe/libqpe-opie.inc index ebb49c0658..3cecedd071 100644 --- a/recipes/libqpe/libqpe-opie.inc +++ b/recipes/libqpe/libqpe-opie.inc @@ -6,10 +6,11 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "uicmoc-native virtual/libqte2" PROVIDES = "virtual/libqpe1" - +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_1.2.2.bb b/recipes/libqpe/libqpe-opie_1.2.2.bb index 009a075091..b209780ff7 100644 --- a/recipes/libqpe/libqpe-opie_1.2.2.bb +++ b/recipes/libqpe/libqpe-opie_1.2.2.bb @@ -1,6 +1,6 @@ require ${PN}.inc -PR = "r3" +PR = "${INC_PR}.0" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \ diff --git a/recipes/libqpe/libqpe-opie_1.2.3.bb b/recipes/libqpe/libqpe-opie_1.2.3.bb index 0822385b9d..1a74e3a156 100644 --- a/recipes/libqpe/libqpe-opie_1.2.3.bb +++ b/recipes/libqpe/libqpe-opie_1.2.3.bb @@ -1,6 +1,6 @@ require ${PN}.inc -PR = "r3" +PR = "${INC_PR}.0" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \ diff --git a/recipes/libqpe/libqpe-opie_1.2.4.bb b/recipes/libqpe/libqpe-opie_1.2.4.bb index 8c2abc7af6..5c1690ec12 100644 --- a/recipes/libqpe/libqpe-opie_1.2.4.bb +++ b/recipes/libqpe/libqpe-opie_1.2.4.bb @@ -1,6 +1,6 @@ require ${PN}.inc -PR = "r0" +PR = "${INC_PR}.0" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \ diff --git a/recipes/libqpe/libqpe-opie_cvs.bb b/recipes/libqpe/libqpe-opie_cvs.bb index 49c1a934e3..8ed2f4d88b 100644 --- a/recipes/libqpe/libqpe-opie_cvs.bb +++ b/recipes/libqpe/libqpe-opie_cvs.bb @@ -1,7 +1,7 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r6" +PR = "${INC_PR}.0" SRC_URI = "${HANDHELDS_CVS};module=opie/library \ file://fix-titleheight.patch;patch=1 \ -- cgit 1.2.3-korg