diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-11-25 13:54:43 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-11-25 13:54:43 +0000 |
| commit | e6fccbb463f2522bb0d20bf07054ce5428a3c1be (patch) | |
| tree | d483d49c9fbc54e7744d0ad6536252639405cb35 /bitbake | |
| parent | f3b89a0ed3d08ba880ca111f868c839d33a0aad4 (diff) | |
| download | openembedded-core-e6fccbb463f2522bb0d20bf07054ce5428a3c1be.tar.gz openembedded-core-e6fccbb463f2522bb0d20bf07054ce5428a3c1be.tar.bz2 openembedded-core-e6fccbb463f2522bb0d20bf07054ce5428a3c1be.zip | |
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
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/ChangeLog | 13 | ||||
| -rw-r--r-- | bitbake/lib/bb/build.py | 2 | ||||
| -rw-r--r-- | bitbake/lib/bb/utils.py | 4 |
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: - Add bzr fetcher - Add support for cleaning directories before a task in the form: do_taskname[cleandirs] = "dir" + - bzr fetcher tweaks from Robert Schuster (#2913) + - Add mercurial (hg) fetcher from Robert Schuster (#2913) + - Fix bogus preferred_version return values + - Fix 'depends' flag splitting + - Fix unexport handling (#3135) + - Add bb.copyfile function similar to bb.movefile (and improve movefile error reporting) + - Allow multiple options for deptask flag + - Use git-fetch instead of git-pull removing any need for merges when + fetching (we don't care about the index). Fixes fetch errors. + - Add BB_GENERATE_MIRROR_TARBALLS option, set to 0 to make git fetches + faster at the expense of not creating mirror tarballs. + - SRCREV handling updates, improvements and fixes from Poky + - Add bb.utils.lockfile() and bb.utils.unlockfile() from Poky Changes in Bitbake 1.8.8: - 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): task_graph.walkdown(task, execute) # make stamp, or cause event and raise exception - if not data.getVarFlag(task, 'nostamp', d): + if not data.getVarFlag(task, 'nostamp', d) and not data.getVarFlag(task, 'selfstamp', d): make_stamp(task, d) def 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): def lockfile(name): """ - Use the file fn as a lock file, return when the lock has been aquired. + Use the file fn as a lock file, return when the lock has been acquired. Returns a variable to pass to unlockfile(). """ while True: # If we leave the lockfiles lying around there is no problem # but we should clean up after ourselves. This gives potential - # for races though. To work around this, when we aquire the lock + # for races though. To work around this, when we acquire the lock # we check the file we locked was still the lock file on disk. # by comparing inode numbers. If they don't match or the lockfile # no longer exists, we start again. |