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

2 files changed, 3 insertions, 3 deletions

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.