summaryrefslogtreecommitdiff
path: root/meta/conf/distro/include
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/conf/distro/include
parent17268d4c9c016783734b1b0a747d35936157b645 (diff)
downloadopenembedded-core-cc8e31cf7e6f12f57de4cff4af8fd6cffd987b15.tar.gz
openembedded-core-cc8e31cf7e6f12f57de4cff4af8fd6cffd987b15.tar.bz2
openembedded-core-cc8e31cf7e6f12f57de4cff4af8fd6cffd987b15.tar.xz
openembedded-core-cc8e31cf7e6f12f57de4cff4af8fd6cffd987b15.zip
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/conf/distro/include')
-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 5d53022a9..3025f1e07 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"
SRCDATE_maemo-mapper-nohildon ?= "20061114"
SRCDATE_matchbox-panel-manager ?= "20060612"
SRCDATE_minimo ?= "20070510"
-SRCDATE_oprofile ?= "20080718"
SRCDATE_xcalibrateext ?= "20051101"
SRCDATE_xcalibrate ?= "20060312"
SRCDATE_yaffs2-utils-native = "20071107"
@@ -158,7 +157,6 @@ PREFERRED_VERSION_gnome-keyring ?= "2.20"
PREFERRED_VERSION_evince ?= "2.20.0"
PREFERRED_VERSION_minimo ?= "0.02+cvs${SRCDATE_minimo}"
-#PREFERRED_VERSION_oprofile ?= "0.9.3+cvs20080718"
PREFERRED_VERSION_oprofile ?= "0.9.4"
PREFERRED_VERSION_elfutils ?= "0.89"
PREFERRED_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 c51e380c0..b2ed74672 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}"
SRCREV_pn-tasks ?= "${AUTOREV}"
SRCREV_pn-libjana = "${AUTOREV}"
+SRCDATE_oprofile ?= "${DATE}"
+
+PREFERRED_VERSION_oprofile ?= "0.9.4+cvs${SRCDATE_oprofile}"
+