summaryrefslogtreecommitdiff
path: root/bitbake-dev
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-09-30 15:22:44 +0000
committerRichard Purdie <richard@openedhand.com>2008-09-30 15:22:44 +0000
commitd54280dd315810ad8cdbce5c52a1af3de902f6ef (patch)
tree516f1a895d86f397388bd750059b9a5a69404277 /bitbake-dev
parent4e522e0d4b9b7ee18678bd08c16548b807aa7229 (diff)
downloadopenembedded-core-d54280dd315810ad8cdbce5c52a1af3de902f6ef.tar.gz
openembedded-core-d54280dd315810ad8cdbce5c52a1af3de902f6ef.tar.bz2
openembedded-core-d54280dd315810ad8cdbce5c52a1af3de902f6ef.tar.xz
openembedded-core-d54280dd315810ad8cdbce5c52a1af3de902f6ef.zip
bitbake-dev: Update against bitbake trunk
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5339 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake-dev')
-rw-r--r--bitbake-dev/ChangeLog6
-rw-r--r--bitbake-dev/lib/bb/build.py3
-rw-r--r--bitbake-dev/lib/bb/fetch/cvs.py6
-rw-r--r--bitbake-dev/lib/bb/providers.py6
4 files changed, 18 insertions, 3 deletions
diff --git a/bitbake-dev/ChangeLog b/bitbake-dev/ChangeLog
index 1ee7fd363..2ad0f713f 100644
--- a/bitbake-dev/ChangeLog
+++ b/bitbake-dev/ChangeLog
@@ -137,6 +137,12 @@ Changes in Bitbake 1.9.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
+ - 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.
Changes in Bitbake 1.8.0:
- Release 1.7.x as a stable series
diff --git a/bitbake-dev/lib/bb/build.py b/bitbake-dev/lib/bb/build.py
index ca7cfbc6b..b8abe6d1b 100644
--- a/bitbake-dev/lib/bb/build.py
+++ b/bitbake-dev/lib/bb/build.py
@@ -267,8 +267,9 @@ def exec_task(task, d):
bb.msg.debug(1, bb.msg.domain.Build, "Executing task %s" % task)
old_overrides = data.getVar('OVERRIDES', d, 0)
localdata = data.createCopy(d)
- data.setVar('OVERRIDES', 'task_%s:%s' % (task, old_overrides), localdata)
+ data.setVar('OVERRIDES', 'task-%s:%s' % (task[3:], old_overrides), localdata)
data.update_data(localdata)
+ data.expandKeys(localdata)
event.fire(TaskStarted(task, localdata))
exec_func(task, localdata)
event.fire(TaskSucceeded(task, localdata))
diff --git a/bitbake-dev/lib/bb/fetch/cvs.py b/bitbake-dev/lib/bb/fetch/cvs.py
index c4ccf4303..aa55ad8bf 100644
--- a/bitbake-dev/lib/bb/fetch/cvs.py
+++ b/bitbake-dev/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)
diff --git a/bitbake-dev/lib/bb/providers.py b/bitbake-dev/lib/bb/providers.py
index 0ad5876ef..63d4f5b3c 100644
--- a/bitbake-dev/lib/bb/providers.py
+++ b/bitbake-dev/lib/bb/providers.py
@@ -296,7 +296,11 @@ def getRuntimeProviders(dataCache, rdepend):
# Only search dynamic packages if we can't find anything in other variables
for pattern in dataCache.packages_dynamic:
- regexp = re.compile(pattern)
+ try:
+ regexp = re.compile(pattern)
+ except:
+ bb.msg.error(bb.msg.domain.Provider, "Error parsing re expression: %s" % pattern)
+ raise
if regexp.match(rdepend):
rproviders += dataCache.packages_dynamic[pattern]