poky.conf: Move fixed revisions to a separate file, add floating revisions file merging in older file contents. Set bleeding builds to use the floating revisions.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4594 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 1 insertions, 198 deletions

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index f2d9c72aeb..857a99667f 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -79,204 +79,7 @@ PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
 PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2"
 PREFERRED_PROVIDER_opkg ?= "opkg"
 
-
-#
-# Source dates or revisions to use:
-#
-
-SRCDATE_abiword ?= "20070130"
-SRCDATE_gtk-theme-torturer ?= "20060821"
-SRCDATE_ipkg-link-1 ?= "20050930"
-SRCDATE_ipkg-link ?= "20050930"
-SRCDATE_ipkg-utils-native ?= "20050930"
-SRCDATE_ipkg-utils ?= "20050930"
-SRCDATE_libmatchbox ?= "20070417"
-SRCDATE_maemo-mapper-nohildon ?= "20061114"
-SRCDATE_matchbox-panel-manager ?= "20060612"
-SRCDATE_minimo ?= "20070510"
-SRCDATE_oprofile ?= "20080210"
-SRCDATE_xcalibrateext ?= "20051101"
-SRCDATE_xcalibrate ?= "20060312"
-SRCDATE_yaffs2-utils-native = "20071107"
-SRCDATE_yaffs2-utils = "20071107"
-
-PV_pn-calibrateproto ?= "0.0-poky1-${SRCREV}"
-SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
-SRCREV_pn-clipboard-manager ?= "14994"
-SRCREV_pn-clutter-box2d = "2743"
-SRCREV_pn-clutter-gst ?= "2616"
-SRCREV_pn-clutter ?= "2616"
-SRCREV_pn-eds-dbus ?= "629"
-SRCREV_pn-evince ?= "2437"
-SRCREV_pn-exmap-console ?= "378"
-SRCREV_pn-fstests ?= "266"
-SRCREV_pn-gaku ?= "375"
-SRCREV_pn-gconf-dbus ?= "638"
-SRCREV_pn-gtkhtml2 ?= "1144"
-SRCREV_pn-gtk-sato-engine ?= "90"
-SRCREV_pn-gtk-theme-torturer ?= "99962ae39bb5aadb31929b25c58e1a053f9c9545"
-SRCREV_pn-gypsy ?= "147"
-SRCREV_pn-libfakekey ?= "2031"
-SRCREV_pn-libgsmd ?= "4335"
-SRCREV_pn-libowl ?= "354"
-SRCREV_pn-libsyncml ?= "241"
-PV_pn-libxcalibrate ?= "0.0-poky1-${SRCREV}"
-SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
-SRCREV_pn-libxosd ?= "627"
-SRCREV_pn-matchbox-applet-light ?= "1548"
-SRCREV_pn-matchbox-common ?= "1561"
-SRCREV_pn-matchbox-config-gtk ?= "1614"
-SRCREV_pn-matchbox-desktop-sato ?= "76"
-SRCREV_pn-matchbox-desktop ?= "2030"
-SRCREV_pn-matchbox-keyboard ?= "1910"
-SRCREV_pn-matchbox-panel-2 ?= "1971"
-SRCREV_pn-matchbox-panel ?= "1364"
-SRCREV_pn-matchbox-stroke ?= "1524"
-SRCREV_pn-matchbox-terminal ?= "1612"
-SRCREV_pn-matchbox-theme-sato-2 ?= "94"
-SRCREV_pn-matchbox-theme-sato ?= "90"
-SRCREV_pn-matchbox-themes-extra ?= "1524"
-SRCREV_pn-matchbox-wm-2 ?= "1873"
-SRCREV_pn-matchbox-wm ?= "1524"
-SRCREV_pn-oh-puzzles ?= "23"
-SRCREV_pn-opkg-native ?= "4467"
-SRCREV_pn-opkg-sdk ?= "4467"
-SRCREV_pn-opkg ?= "4467"
-SRCREV_pn-oprofileui ?= "173"
-SRCREV_pn-owl-video-widget ?= "324"
-SRCREV_pn-psplash ?= "377"
-QEMUSRCREV = "4242"
-SRCREV_pn-qemu-native ?= "${QEMUSRCREV}"
-SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}"
-SRCREV_pn-qemu ?= "${QEMUSRCREV}"
-SRCREV_pn-screenshot ?= "288"
-SRCREV_pn-settings-daemon ?= "1825"
-SRCREV_pn-vincent ?= "246"
-SRCREV_pn-webkit-gtk ?= "31859"
-SRCREV_pn-web-webkit ?= "107"
-SRCREV_pn-web ?= "97"
-SRCREV_pn-xvideo-tests ?= "272"
-SRCREV_pn-zaurusd ?= "358"
-
-# Previously floating revisions
-SRCREV_pn-aaina ?= "1231"
-SRCREV_pn-clutter-cairo ?= "1223"
-SRCREV_pn-clutter-gst ?= "1454"
-SRCREV_pn-libmatchbox ?= "1531"
-SRCREV_pn-libopensync-plugin-evo2-sync ?= "2394"
-SRCREV_pn-libopensync-plugin-file-sync ?= "2392"
-SRCREV_pn-libopensync ?= "2430"
-SRCREV_pn-libsync ?= "208"
-SRCREV_pn-msynctool ?= "314"
-SRCREV_pn-networkmanager-applet ?= "263"
-SRCREV_pn-networkmanager ?= "2984"
-SRCREV_pn-table ?= "1456"
-SRCREV_pn-ubootchart ?= "10"
-
-SRCREV_pn-dfu-util-native = "3139"
-SRCREV_pn-dfu-util = "3139"
-SRCREV_pn-libgsmd ?= "4335"
-SRCREV_pn-libjana = "704"
-SRCREV_pn-libmokogsmd2 ?= "4334"
-SRCREV_pn-libmokojournal2 ?= "3473"
-SRCREV_pn-libmokopanelui2 ?= "3349"
-SRCREV_pn-libmokoui2 ?= "4342"
-SRCREV_pn-linux-openmoko ?= "5ccaca2adb1c37b5955a4733f68ae08a755e3d78"
-SRCREV_pn-moko-gtk-engine ?= "3612"
-SRCREV_pn-neod = "3409"
-SRCREV_pn-ohm = "edfe25d49d67884bf004de7ae0724c162bb5e65e"
-SRCREV_pn-openmoko-alsa-scenarios ?= "4406"
-SRCREV_pn-openmoko-appearance ?= "3262"
-SRCREV_pn-openmoko-appmanager2 ?= "3442"
-SRCREV_pn-openmoko-browser2 ?= "4172"
-SRCREV_pn-openmoko-calculator2 ?= "3655"
-SRCREV_pn-openmoko-common2 ?= "3259"
-SRCREV_pn-openmoko-contacts2 ?= "418"
-SRCREV_pn-openmoko-dates2 ?= "673"
-SRCREV_pn-openmoko-dialer2 ?= "4448"
-SRCREV_pn-openmoko-feedreader2 ?= "3645"
-SRCREV_pn-openmoko-firststart2 ?= "3158"
-SRCREV_pn-openmoko-icon-theme-standard2 ?= "4232"
-SRCREV_pn-openmoko-mediaplayer2 ?= "4173"
-SRCREV_pn-openmoko-messages2 ?= "4340"
-SRCREV_pn-openmoko-sample2 ?= "3537"
-SRCREV_pn-openmoko-sound-theme-standard2 ?= "4271"
-SRCREV_pn-openmoko-tasks2 ?= "403"
-SRCREV_pn-openmoko-terminal2 ?= "4039"
-SRCREV_pn-openmoko-theme-standard2 ?= "4338"
-SRCREV_pn-openmoko-today2-folders ?= "3704"
-SRCREV_pn-openmoko-today2 ?= "4168"
-SRCREV_pn-openmoko-worldclock2 ?= "3365"
-SRCREV_pn-uboot-openmoko_patches ?= "3400"
-SRCREV_pn-uboot-openmoko_upstream ?= "1ce55151c85d068f70317a8d65c61058b891afb4"
-SRCREV_pn-usbpath-native = "3172"
-SRCREV_pn-usbpath = "3172"
-SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"
-
-#
-# Preferred Versions:
-#
-PREFERRED_VERSION_matchbox ?= "0.9.1"
-PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
-PREFERRED_VERSION_matchbox-applet-startup-monitor ?= "0.1"
-PREFERRED_VERSION_matchbox-common ?= "0.9.1+svnr${SRCREV}"
-PREFERRED_VERSION_matchbox-config-gtk ?= "0.0+svnr${SRCREV}"
-PREFERRED_VERSION_matchbox-desktop ?= "2.0+svnr${SRCREV}"
-PREFERRED_VERSION_matchbox-keyboard ?= "0.0+svnr${SRCREV}"
-PREFERRED_VERSION_matchbox-panel ?= "0.9.2+svnr${SRCREV}"
-PREFERRED_VERSION_matchbox-stroke ?= "0.0+svnr${SRCREV}"
-PREFERRED_VERSION_matchbox-themes-extra ?= "0.3+svnr${SRCREV}"
-PREFERRED_VERSION_matchbox-wm ?= "1.2+svnr${SRCREV}"
-PREFERRED_VERSION_libmatchbox ?= "1.9"
-PREFERRED_VERSION_gtk-engines ?= "2.12.0"
-PREFERRED_VERSION_gtk-sato-engine ?= "0.3.1"
-PREFERRED_VERSION_matchbox-theme-sato ?= "0.1"
-PREFERRED_VERSION_sato-icon-theme ?= "0.4.1"
-
-PREFERRED_VERSION_glib-2.0 ?= "2.16.3"
-PREFERRED_VERSION_glib-2.0-native ?= "2.16.3"
-PREFERRED_VERSION_atk ?= "1.20.0"
-PREFERRED_VERSION_cairo ?= "1.6.4"
-PREFERRED_VERSION_pango ?= "1.18.3"
-PREFERRED_VERSION_gtk+ ?= "2.12.7"
-
-PREFERRED_VERSION_dbus ?= "1.1.20"
-PREFERRED_VERSION_dbus-native ?= "1.1.20"
-PREFERRED_VERSION_dbus-glib ?= "0.74"
-PREFERRED_VERSION_dbus-glib-native ?= "0.74"
-PREFERRED_VERSION_gnome-vfs ?= "2.22.0"
-PREFERRED_VERSION_libgnomecanvas ?= "2.20.0"
-PREFERRED_VERSION_gnome-keyring ?= "2.20"
-
-PREFERRED_VERSION_dillo2 ?= "0.6.6"
-PREFERRED_VERSION_evince ?= "2.20.0"
-PREFERRED_VERSION_firefox ?= "1.0"
-PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904"
-PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
-PREFERRED_VERSION_keylaunch ?= "2.0.7"
-PREFERRED_VERSION_librsvg ?= "2.18.2"
-PREFERRED_VERSION_libgsm ?= "1.0.10"
-PREFERRED_VERSION_libschedule ?= "0.15"
-PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
-PREFERRED_VERSION_linphone ?= "0.12.2"
-PREFERRED_VERSION_minilite ?= "0.49"
-PREFERRED_VERSION_minimo ?= "0.02+cvs${SRCDATE_minimo}"
-PREFERRED_VERSION_poppler ?= "0.6"
-PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}"
-PREFERRED_VERSION_rxvt-unicode ?= "5.6"
-PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
-PREFERRED_VERSION_xdemineur ?= "2.1.1"
-PREFERRED_VERSION_xextensions ?= "1.0.1"
-
-
-PREFERRED_VERSION_xmonobut ?= "0.4"
-PREFERRED_VERSION_xprop ?= "1.0.3"
-PREFERRED_VERSION_xst ?= "0.15"
-PREFERRED_VERSION_oprofile ?= "0.9.3+cvs20080210"
-PREFERRED_VERSION_elfutils ?= "0.89"
-PREFERRED_VERSION_hal ?= "0.5.9.1"
-PREFERRED_VERSION_hal-info ?= "20070831"
-
+require conf/distro/include/poky-fixed-revisions.inc
 require conf/distro/include/preferred-xorg-versions.inc
 
 PCMCIA_MANAGER ?= "pcmciautils"