From cc8e31cf7e6f12f57de4cff4af8fd6cffd987b15 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 18 Jul 2008 18:07:19 +0000 Subject: [PATCH] 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 --- meta/conf/distro/include/poky-fixed-revisions.inc | 2 -- meta/conf/distro/include/poky-floating-revisions.inc | 4 ++++ 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" 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 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}" SRCREV_pn-tasks ?= "${AUTOREV}" SRCREV_pn-libjana = "${AUTOREV}" +SRCDATE_oprofile ?= "${DATE}" + +PREFERRED_VERSION_oprofile ?= "0.9.4+cvs${SRCDATE_oprofile}" +