summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-07-18 18:07:19 +0000
committerRichard Purdie <richard@openedhand.com>2008-07-18 18:07:19 +0000
commitcc8e31cf7e6f12f57de4cff4af8fd6cffd987b15 (patch)
tree7e4bae7f9502eb1ec25a4983fea1b1e74ba10b40 /meta
parent17268d4c9c016783734b1b0a747d35936157b645 (diff)
downloadpoky-cc8e31cf7e6f12f57de4cff4af8fd6cffd987b15.tar.gz
poky-floating-revisions.inc: Allow oprofile version to float in bleeding builds
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4886 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc2
-rw-r--r--meta/conf/distro/include/poky-floating-revisions.inc4
2 files changed, 4 insertions, 2 deletions
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 5d53022a9e..3025f1e07d 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -12,7 +12,6 @@ SRCDATE_libmatchbox ?= "20070417"
12SRCDATE_maemo-mapper-nohildon ?= "20061114" 12SRCDATE_maemo-mapper-nohildon ?= "20061114"
13SRCDATE_matchbox-panel-manager ?= "20060612" 13SRCDATE_matchbox-panel-manager ?= "20060612"
14SRCDATE_minimo ?= "20070510" 14SRCDATE_minimo ?= "20070510"
15SRCDATE_oprofile ?= "20080718"
16SRCDATE_xcalibrateext ?= "20051101" 15SRCDATE_xcalibrateext ?= "20051101"
17SRCDATE_xcalibrate ?= "20060312" 16SRCDATE_xcalibrate ?= "20060312"
18SRCDATE_yaffs2-utils-native = "20071107" 17SRCDATE_yaffs2-utils-native = "20071107"
@@ -158,7 +157,6 @@ PREFERRED_VERSION_gnome-keyring ?= "2.20"
158 157
159PREFERRED_VERSION_evince ?= "2.20.0" 158PREFERRED_VERSION_evince ?= "2.20.0"
160PREFERRED_VERSION_minimo ?= "0.02+cvs${SRCDATE_minimo}" 159PREFERRED_VERSION_minimo ?= "0.02+cvs${SRCDATE_minimo}"
161#PREFERRED_VERSION_oprofile ?= "0.9.3+cvs20080718"
162PREFERRED_VERSION_oprofile ?= "0.9.4" 160PREFERRED_VERSION_oprofile ?= "0.9.4"
163PREFERRED_VERSION_elfutils ?= "0.89" 161PREFERRED_VERSION_elfutils ?= "0.89"
164PREFERRED_VERSION_hal ?= "0.5.9.1" 162PREFERRED_VERSION_hal ?= "0.5.9.1"
diff --git a/meta/conf/distro/include/poky-floating-revisions.inc b/meta/conf/distro/include/poky-floating-revisions.inc
index c51e380c0a..b2ed746728 100644
--- a/meta/conf/distro/include/poky-floating-revisions.inc
+++ b/meta/conf/distro/include/poky-floating-revisions.inc
@@ -55,3 +55,7 @@ SRCREV_pn-libmatchbox ?= "${AUTOREV}"
55SRCREV_pn-tasks ?= "${AUTOREV}" 55SRCREV_pn-tasks ?= "${AUTOREV}"
56SRCREV_pn-libjana = "${AUTOREV}" 56SRCREV_pn-libjana = "${AUTOREV}"
57 57
58SRCDATE_oprofile ?= "${DATE}"
59
60PREFERRED_VERSION_oprofile ?= "0.9.4+cvs${SRCDATE_oprofile}"
61