Convert CVSDATE -> SRCDATE. Also standardise cvs and svn PVs to x.x.x+cvsYYYYMMDD format and some includes some minor whitespace cleanup.

13 files changed, 46 insertions, 46 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 06d9e61ac5..bebad809d2 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -309,7 +309,7 @@ RESUMECOMMAND = ""
 RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
 UPDATECOMMAND = ""
 UPDATECOMMAND_cvs = "/usr/bin/env cvs update -d -P ${CVSCOOPTS}"
-CVSDATE = "${DATE}"
+SRCDATE = "${DATE}"
 
 SRC_URI = "file://${FILE}"
 
diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf
index 90745ebe2d..1a5600c986 100644
--- a/conf/distro/familiar-unstable.conf
+++ b/conf/distro/familiar-unstable.conf
@@ -14,8 +14,8 @@ FEED_URIS += " \
         base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \
 	updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates"
 
-#CVSDATE = 20050331
-#CVSDATE = "now"
+#SRCDATE = 20050331
+#SRCDATE = "now"
 
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
diff --git a/conf/distro/jlime-shrek.conf b/conf/distro/jlime-shrek.conf
index e25c7e64de..2dd9641137 100644
--- a/conf/distro/jlime-shrek.conf
+++ b/conf/distro/jlime-shrek.conf
@@ -10,7 +10,7 @@ DISTRO_TYPE = "release"
 
 export FEED_URLS_jlime = "shrek##http://www.jlime.com/downloads/releases/shrek/${TARGET_ARCH}/feed/"
 
-CVSDATE = 20050518
+SRCDATE = 20050518
 
 PREFERRED_PROVIDERS  =  "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
diff --git a/conf/distro/maemo-1.0.conf b/conf/distro/maemo-1.0.conf
index 15ec45f34e..f83e4b1d96 100644
--- a/conf/distro/maemo-1.0.conf
+++ b/conf/distro/maemo-1.0.conf
@@ -11,7 +11,7 @@ FEED_URIS += " \
         base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \
 	updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates"
 
-#CVSDATE = 20050331
+#SRCDATE = 20050331
 
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf
index 77d14dc518..c7fcb83610 100644
--- a/conf/distro/nylon.conf
+++ b/conf/distro/nylon.conf
@@ -19,7 +19,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
 
-#CVSDATE = 20040916
+#SRCDATE = 20040916
 
 PREFERRED_VERSION_glibc = "2.3.3"
 PREFERRED_VERSION_gcc-cross-initial = "3.3.4"
diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf
index 2e4a943337..009f9c9290 100644
--- a/conf/distro/openzaurus-unstable.conf
+++ b/conf/distro/openzaurus-unstable.conf
@@ -14,7 +14,7 @@ DISTRO_TYPE = "debug"
 #            console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
 #              devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
 
-# CVSDATE = "20050704"
+# SRCDATE = "20050704"
 
 #
 # Zaurus
diff --git a/conf/distro/preferred-gpe-versions-2.6.inc b/conf/distro/preferred-gpe-versions-2.6.inc
index 98c1a969fa..d4422e86e9 100644
--- a/conf/distro/preferred-gpe-versions-2.6.inc
+++ b/conf/distro/preferred-gpe-versions-2.6.inc
@@ -3,10 +3,10 @@
 #
 
 #work around some breakages
-CVSDATE_xserver-kdrive=20050207
-CVSDATE_minimo=20050401
-CVSDATE_cairo=20050330
-CVSDATE_xext=20050222
+SRCDATE_xserver-kdrive=20050207
+SRCDATE_minimo=20050401
+SRCDATE_cairo=20050330
+SRCDATE_xext=20050222
 
 #set some preferred providers:
 PREFERRED_PROVIDER_gconf=gconf-dbus
@@ -32,10 +32,10 @@ PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
 PREFERRED_VERSION_rxvt-unicode ?= "5.3"
 PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
 PREFERRED_VERSION_xst ?= "0.14"
-#PREFERRED_VERSION_xextensions ?= "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" 
-PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
-PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
+#PREFERRED_VERSION_xextensions ?= "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" 
+PREFERRED_VERSION_xhost ?= "0.0+cvs20040413"
+PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
 PREFERRED_VERSION_gpe-login ?= "0.76"
 PREFERRED_VERSION_gpe-session-scripts ?= "0.62"
 PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
@@ -77,9 +77,9 @@ PREFERRED_VERSION_gpe-tetris ?= "0.6-2"
 PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
 PREFERRED_VERSION_xdemineur ?= "2.1.1"
 PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
-PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}"
 PREFERRED_VERSION_dillo2 ?= "0.6.6"
-PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
+PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}"
 PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
 PREFERRED_VERSION_linphone ?= "0.12.2"
 PREFERRED_VERSION_firefox ?= "1.0"
diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc
index 9f2c041839..59567312ad 100644
--- a/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/conf/distro/preferred-gpe-versions-2.7.inc
@@ -3,7 +3,7 @@
 #
 
 #work around some breakages
-#CVSDATE_minimo=20050401
+#SRCDATE_minimo=20050401
 
 #set some preferred providers:
 PREFERRED_PROVIDER_gconf=gconf-dbus
@@ -14,7 +14,7 @@ PREFERRED_VERSION_libmatchbox ?= "1.7"
 PREFERRED_VERSION_matchbox ?= "0.9.1"
 PREFERRED_VERSION_matchbox-common ?= "0.9.1"
 PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
-PREFERRED_VERSION_matchbox-wm ?= "0.9.5+cvs-${CVSDATE}"
+PREFERRED_VERSION_matchbox-wm ?= "0.9.5+cvs${SRCDATE}"
 PREFERRED_VERSION_matchbox-panel ?= "0.9.2"
 PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
 PREFERRED_VERSION_atk ?= "1.9.0"
@@ -36,10 +36,10 @@ PREFERRED_VERSION_rxvt-unicode ?= "5.6"
 PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
 PREFERRED_VERSION_xst ?= "0.15"
 PREFERRED_VERSION_xextensions ?= "1.0.1"
-PREFERRED_VERSION_xserver-kdrive = "0.0cvs20050207"
-PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" 
-PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
-PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20050207"
+PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" 
+PREFERRED_VERSION_xhost ?= "0.0+cvs20040413"
+PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
 PREFERRED_VERSION_gpe-login ?= "0.83"
 PREFERRED_VERSION_gpe-session-scripts ?= "0.66"
 PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
@@ -82,13 +82,13 @@ PREFERRED_VERSION_gpe-tetris ?= "0.6-4"
 PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
 PREFERRED_VERSION_xdemineur ?= "2.1.1"
 PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
-PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}"
 PREFERRED_VERSION_dillo2 ?= "0.6.6"
-PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
+PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}"
 PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
 PREFERRED_VERSION_linphone ?= "0.12.2"
 PREFERRED_VERSION_firefox ?= "1.0"
-PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904"
+PREFERRED_VERSION_gaim ?= "2.0.0+cvs20050904-mco1"
 PREFERRED_VERSION_poppler ?= "0.3.3"
 PREFERRED_VERSION_evince ?= "0.3.2"
 PREFERRED_VERSION_gpe_mini_browser ?= "0.18"
diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc
index b68eb32c2a..676e0ee9f9 100644
--- a/conf/distro/preferred-gpe-versions.inc
+++ b/conf/distro/preferred-gpe-versions.inc
@@ -3,7 +3,7 @@
 #
 
 #work around some breakages
-#CVSDATE_xext=20050222
+#SRCDATE_xext=20050222
 
 #set some preferred providers:
 PREFERRED_PROVIDER_gconf=gconf-dbus
@@ -31,9 +31,9 @@ PREFERRED_VERSION_rxvt-unicode ?= "5.3"
 #PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
 #PREFERRED_VERSION_xst ?= "0.14"
 PREFERRED_VERSION_xextensions ?= "1.0.1"
-PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" 
-PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
-PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" 
+PREFERRED_VERSION_xhost ?= "0.0+cvs20040413"
+PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
 #PREFERRED_VERSION_gpe-login ?= "0.76"
 #PREFERRED_VERSION_gpe-session-scripts ?= "0.62"
 #PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
@@ -75,9 +75,9 @@ PREFERRED_VERSION_dbus ?= "0.23.4"
 #PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
 #PREFERRED_VERSION_xdemineur ?= "2.1.1"
 #PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
-PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}"
 #PREFERRED_VERSION_dillo2 ?= "0.6.6"
-PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
+PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}"
 #PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
 #PREFERRED_VERSION_linphone ?= "0.12.2"
 #PREFERRED_VERSION_firefox ?= "1.0"
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index bf07d6b1f0..11bb62a5d1 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -56,7 +56,7 @@ include conf/distro/preferred-opie-versions.inc
 # GPE
 #
 
-CVSDATE_xserver-kdrive = "20050208"
+SRCDATE_xserver-kdrive = "20050208"
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
 
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index 21f1ae5bb9..afeba5bd56 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -170,7 +170,7 @@ PREFERRED_VERSION_ixp400-eth ?= "1.5"
 
 # Select the smallest provider of x11 libraries
 PREFERRED_PROVIDER_x11 ?= "diet-x11"
-CVSDATE_diet-x11 ?= "20051005"
+SRCDATE_diet-x11 ?= "20051005"
 
 # Ensure consistency across all SlugOS builds for the provider of a
 # relational database - use the latest version of the SleepyCat
diff --git a/conf/machine/nas100d.conf b/conf/machine/nas100d.conf
index aa37f0920d..45df317bac 100644
--- a/conf/machine/nas100d.conf
+++ b/conf/machine/nas100d.conf
@@ -135,12 +135,12 @@ USE_VT = "0"
 #-------------------------------------------------------------------------------
 # Package versions
 #-------------------------------------------------------------------------------
-CVSDATE_gnu-config ?= "20050713"
-CVSDATE_gnu-config-native ?= "20050713"
-CVSDATE_ipkg-utils ?= "20050713"
-CVSDATE_ipkg-utils-native ?= "20050713"
-CVSDATE_ipkg-link ?= "20050713"
-CVSDATE_irssi ?= "20050930"
+SRCDATE_gnu-config ?= "20050713"
+SRCDATE_gnu-config-native ?= "20050713"
+SRCDATE_ipkg-utils ?= "20050713"
+SRCDATE_ipkg-utils-native ?= "20050713"
+SRCDATE_ipkg-link ?= "20050713"
+SRCDATE_irssi ?= "20050930"
 
 CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
 INHERIT += "nslu2-mirrors"
diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
index be85a82048..a28591dc57 100644
--- a/conf/machine/nslu2.conf
+++ b/conf/machine/nslu2.conf
@@ -141,12 +141,12 @@ USE_VT = "0"
 #-------------------------------------------------------------------------------
 # Package versions
 #-------------------------------------------------------------------------------
-CVSDATE_gnu-config ?= "20050713"
-CVSDATE_gnu-config-native ?= "20050713"
-CVSDATE_ipkg-utils ?= "20050713"
-CVSDATE_ipkg-utils-native ?= "20050713"
-CVSDATE_ipkg-link ?= "20050713"
-CVSDATE_irssi ?= "20050930"
+SRCDATE_gnu-config ?= "20050713"
+SRCDATE_gnu-config-native ?= "20050713"
+SRCDATE_ipkg-utils ?= "20050713"
+SRCDATE_ipkg-utils-native ?= "20050713"
+SRCDATE_ipkg-link ?= "20050713"
+SRCDATE_irssi ?= "20050930"
 
 CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
 INHERIT += "nslu2-mirrors"