diff options
author | Richard Purdie <richard@openedhand.com> | 2008-07-18 18:07:19 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2008-07-18 18:07:19 +0000 |
commit | cc8e31cf7e6f12f57de4cff4af8fd6cffd987b15 (patch) | |
tree | 7e4bae7f9502eb1ec25a4983fea1b1e74ba10b40 /meta | |
parent | 17268d4c9c016783734b1b0a747d35936157b645 (diff) | |
download | poky-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.inc | 2 | ||||
-rw-r--r-- | 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" | |||
12 | SRCDATE_maemo-mapper-nohildon ?= "20061114" | 12 | SRCDATE_maemo-mapper-nohildon ?= "20061114" |
13 | SRCDATE_matchbox-panel-manager ?= "20060612" | 13 | SRCDATE_matchbox-panel-manager ?= "20060612" |
14 | SRCDATE_minimo ?= "20070510" | 14 | SRCDATE_minimo ?= "20070510" |
15 | SRCDATE_oprofile ?= "20080718" | ||
16 | SRCDATE_xcalibrateext ?= "20051101" | 15 | SRCDATE_xcalibrateext ?= "20051101" |
17 | SRCDATE_xcalibrate ?= "20060312" | 16 | SRCDATE_xcalibrate ?= "20060312" |
18 | SRCDATE_yaffs2-utils-native = "20071107" | 17 | SRCDATE_yaffs2-utils-native = "20071107" |
@@ -158,7 +157,6 @@ PREFERRED_VERSION_gnome-keyring ?= "2.20" | |||
158 | 157 | ||
159 | PREFERRED_VERSION_evince ?= "2.20.0" | 158 | PREFERRED_VERSION_evince ?= "2.20.0" |
160 | PREFERRED_VERSION_minimo ?= "0.02+cvs${SRCDATE_minimo}" | 159 | PREFERRED_VERSION_minimo ?= "0.02+cvs${SRCDATE_minimo}" |
161 | #PREFERRED_VERSION_oprofile ?= "0.9.3+cvs20080718" | ||
162 | PREFERRED_VERSION_oprofile ?= "0.9.4" | 160 | PREFERRED_VERSION_oprofile ?= "0.9.4" |
163 | PREFERRED_VERSION_elfutils ?= "0.89" | 161 | PREFERRED_VERSION_elfutils ?= "0.89" |
164 | PREFERRED_VERSION_hal ?= "0.5.9.1" | 162 | 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}" | |||
55 | SRCREV_pn-tasks ?= "${AUTOREV}" | 55 | SRCREV_pn-tasks ?= "${AUTOREV}" |
56 | SRCREV_pn-libjana = "${AUTOREV}" | 56 | SRCREV_pn-libjana = "${AUTOREV}" |
57 | 57 | ||
58 | SRCDATE_oprofile ?= "${DATE}" | ||
59 | |||
60 | PREFERRED_VERSION_oprofile ?= "0.9.4+cvs${SRCDATE_oprofile}" | ||
61 | |||