From dc98b2c28c0a7a7ea715230a234bb846a18e4584 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Tue, 30 Sep 2008 20:32:33 +0000
Subject: bitbake: Sync with 1.8 branch upstream

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5345 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 bitbake/ChangeLog                 | 10 ++++++++++
 bitbake/doc/bitbake.1             | 13 +++++++------
 bitbake/doc/manual/usermanual.xml |  1 +
 bitbake/lib/bb/fetch/cvs.py       |  6 +++++-
 4 files changed, 23 insertions(+), 7 deletions(-)

(limited to 'bitbake')

diff --git a/bitbake/ChangeLog b/bitbake/ChangeLog
index 561b618ae..c4aa5ba19 100644
--- a/bitbake/ChangeLog
+++ b/bitbake/ChangeLog
@@ -41,7 +41,17 @@ Changes in BitBake 1.8.x:
 	- Add PERSISTENT_DIR to store the PersistData in a persistent
 	  directory != the cache dir.
 	- Add md5 and sha256 checksum generation functions to utils.py
+	- Make sure Build Completed events are generated even when tasks fail
+	- Correctly handle '-' characters in class names (#2958)
+	- Make sure expandKeys has been called on the data dictonary before running tasks
+	- Correctly add a task override in the form task-TASKNAME.
 	- Revert the '-' character fix in class names since it breaks things
+	- When a regexp fails to compile for PACKAGES_DYNAMIC, print a more useful error (#4444)
+	- Allow to checkout CVS by Date and Time. Just add HHmm to the SRCDATE.
+	- Move prunedir function to utils.py and add explode_dep_versions function
+	- Raise an exception if SRCREV == 'INVALID'
+	- Fix hg fetcher username/password handling and fix crash
+	- Fix PACKAGES_DYNAMIC handling of packages with '++' in the name
 
 Changes in BitBake 1.8.10:
 	- Psyco is available only for x86 - do not use it on other architectures.
diff --git a/bitbake/doc/bitbake.1 b/bitbake/doc/bitbake.1
index e6cbe7df0..01172d741 100644
--- a/bitbake/doc/bitbake.1
+++ b/bitbake/doc/bitbake.1
@@ -97,12 +97,13 @@ emit the dependency trees of the specified packages in the dot syntax
 .B \-IIGNORED\_DOT\_DEPS, \-\-ignore-deps=IGNORED_DOT_DEPS
 Stop processing at the given list of dependencies when generating dependency
 graphs. This can help to make the graph more appealing
-.\"
-.\" Next option is only in BitBake 1.7.x (trunk)
-.\"
-.\".TP
-.\".B \-lDEBUG_DOMAINS, \-\-log-domains=DEBUG_DOMAINS
-.\"Show debug logging for the specified logging domains
+.TP
+.B \-lDEBUG_DOMAINS, \-\-log-domains=DEBUG_DOMAINS
+Show debug logging for the specified logging domains
+.TP
+.B \-P, \-\-profile
+profile the command and print a report
+.TP
 
 .SH AUTHORS
 BitBake was written by 
diff --git a/bitbake/doc/manual/usermanual.xml b/bitbake/doc/manual/usermanual.xml
index a79716a0a..a01801e03 100644
--- a/bitbake/doc/manual/usermanual.xml
+++ b/bitbake/doc/manual/usermanual.xml
@@ -415,6 +415,7 @@ options:
                         the graph more appealing
   -l DEBUG_DOMAINS, --log-domains=DEBUG_DOMAINS
                         Show debug logging for the specified logging domains
+  -P, --profile         profile the command and print a report
 
 </screen>
                 </para>
diff --git a/bitbake/lib/bb/fetch/cvs.py b/bitbake/lib/bb/fetch/cvs.py
index c4ccf4303..aa55ad8bf 100644
--- a/bitbake/lib/bb/fetch/cvs.py
+++ b/bitbake/lib/bb/fetch/cvs.py
@@ -118,7 +118,11 @@ class Cvs(Fetch):
         if 'norecurse' in ud.parm:
             options.append("-l")
         if ud.date:
-            options.append("-D \"%s UTC\"" % ud.date)
+            # treat YYYYMMDDHHMM specially for CVS
+            if len(ud.date) == 12:
+                options.append("-D \"%s %s:%s UTC\"" % (ud.date[0:8], ud.date[8:10], ud.date[10:12]))
+            else:
+                options.append("-D \"%s UTC\"" % ud.date)
         if ud.tag:
             options.append("-r %s" % ud.tag)
 
-- 
cgit v1.2.3