summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-11-25 13:54:43 +0000
committerRichard Purdie <richard@openedhand.com>2007-11-25 13:54:43 +0000
commite6fccbb463f2522bb0d20bf07054ce5428a3c1be (patch)
treed483d49c9fbc54e7744d0ad6536252639405cb35
parentf3b89a0ed3d08ba880ca111f868c839d33a0aad4 (diff)
downloadpoky-e6fccbb463f2522bb0d20bf07054ce5428a3c1be.tar.gz
bitbake: Sync with upstream, fix some typos, add selfstamp flag
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3227 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--bitbake/ChangeLog13
-rw-r--r--bitbake/lib/bb/build.py2
-rw-r--r--bitbake/lib/bb/utils.py4
3 files changed, 16 insertions, 3 deletions
diff --git a/bitbake/ChangeLog b/bitbake/ChangeLog
index 4125e03169..4fddeca86c 100644
--- a/bitbake/ChangeLog
+++ b/bitbake/ChangeLog
@@ -12,6 +12,19 @@ Changes in BitBake 1.8.x:
12 - Add bzr fetcher 12 - Add bzr fetcher
13 - Add support for cleaning directories before a task in the form: 13 - Add support for cleaning directories before a task in the form:
14 do_taskname[cleandirs] = "dir" 14 do_taskname[cleandirs] = "dir"
15 - bzr fetcher tweaks from Robert Schuster (#2913)
16 - Add mercurial (hg) fetcher from Robert Schuster (#2913)
17 - Fix bogus preferred_version return values
18 - Fix 'depends' flag splitting
19 - Fix unexport handling (#3135)
20 - Add bb.copyfile function similar to bb.movefile (and improve movefile error reporting)
21 - Allow multiple options for deptask flag
22 - Use git-fetch instead of git-pull removing any need for merges when
23 fetching (we don't care about the index). Fixes fetch errors.
24 - Add BB_GENERATE_MIRROR_TARBALLS option, set to 0 to make git fetches
25 faster at the expense of not creating mirror tarballs.
26 - SRCREV handling updates, improvements and fixes from Poky
27 - Add bb.utils.lockfile() and bb.utils.unlockfile() from Poky
15 28
16Changes in Bitbake 1.8.8: 29Changes in Bitbake 1.8.8:
17 - Rewrite svn fetcher to make adding extra operations easier 30 - Rewrite svn fetcher to make adding extra operations easier
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
index 501f4f8206..f41898ec14 100644
--- a/bitbake/lib/bb/build.py
+++ b/bitbake/lib/bb/build.py
@@ -297,7 +297,7 @@ def exec_task(task, d):
297 task_graph.walkdown(task, execute) 297 task_graph.walkdown(task, execute)
298 298
299 # make stamp, or cause event and raise exception 299 # make stamp, or cause event and raise exception
300 if not data.getVarFlag(task, 'nostamp', d): 300 if not data.getVarFlag(task, 'nostamp', d) and not data.getVarFlag(task, 'selfstamp', d):
301 make_stamp(task, d) 301 make_stamp(task, d)
302 302
303def extract_stamp_data(d, fn): 303def extract_stamp_data(d, fn):
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
index c27dafd614..a2a5ff6cfd 100644
--- a/bitbake/lib/bb/utils.py
+++ b/bitbake/lib/bb/utils.py
@@ -205,13 +205,13 @@ def Enum(*names):
205 205
206def lockfile(name): 206def lockfile(name):
207 """ 207 """
208 Use the file fn as a lock file, return when the lock has been aquired. 208 Use the file fn as a lock file, return when the lock has been acquired.
209 Returns a variable to pass to unlockfile(). 209 Returns a variable to pass to unlockfile().
210 """ 210 """
211 while True: 211 while True:
212 # If we leave the lockfiles lying around there is no problem 212 # If we leave the lockfiles lying around there is no problem
213 # but we should clean up after ourselves. This gives potential 213 # but we should clean up after ourselves. This gives potential
214 # for races though. To work around this, when we aquire the lock 214 # for races though. To work around this, when we acquire the lock
215 # we check the file we locked was still the lock file on disk. 215 # we check the file we locked was still the lock file on disk.
216 # by comparing inode numbers. If they don't match or the lockfile 216 # by comparing inode numbers. If they don't match or the lockfile
217 # no longer exists, we start again. 217 # no longer exists, we start again.