diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2011-06-22 15:10:58 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-24 12:23:12 +0100 |
commit | a1f79a7896b6411669b3ccada6204d2695e80fc5 (patch) | |
tree | d032e623fd249286bd8966c0409bb66f350638ac /bitbake/lib | |
parent | d08a341af77ac0ad618d4033a18f33ac1fc98fb2 (diff) | |
download | ast2050-yocto-poky-a1f79a7896b6411669b3ccada6204d2695e80fc5.zip ast2050-yocto-poky-a1f79a7896b6411669b3ccada6204d2695e80fc5.tar.gz |
runqueue.py: Add umask task control
The umask for a task can now be set as:
task[umask] = 022
task[umask] = '022'
If specified as a text string, it must be octal. (This is due to
recipe parsing where it's always set to a string.)
[RP tweaked to use None instead of -1]
(Bitbake rev: a5caaaaba8f0db1af5d8f2e610021d6d4b56894e)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/build.py | 1 | ||||
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py index 7947906..f69464c 100644 --- a/bitbake/lib/bb/build.py +++ b/bitbake/lib/bb/build.py @@ -463,6 +463,7 @@ def add_tasks(tasklist, d): getTask('nostamp') getTask('fakeroot') getTask('noexec') + getTask('umask') task_deps['parents'][task] = [] for dep in flags['deps']: dep = data.expand(dep, d) diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 7a17fce..b801877 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -1063,8 +1063,16 @@ class RunQueueExecute: # a fork() or exec*() activates PSEUDO... envbackup = {} + umask = None taskdep = self.rqdata.dataCache.task_deps[fn] + if 'umask' in taskdep and taskname in taskdep['umask']: + # umask might come in as a number or text string.. + try: + umask = int(taskdep['umask'][taskname],8) + except TypeError: + umask = taskdep['umask'][taskname] + if 'fakeroot' in taskdep and taskname in taskdep['fakeroot']: envvars = (self.rqdata.dataCache.fakerootenv[fn] or "").split() for key, value in (var.split('=') for var in envvars): @@ -1103,6 +1111,9 @@ class RunQueueExecute: newsi = os.open(os.devnull, os.O_RDWR) os.dup2(newsi, sys.stdin.fileno()) + if umask: + os.umask(umask) + bb.data.setVar("BB_WORKERCONTEXT", "1", self.cooker.configuration.data) bb.data.setVar("__RUNQUEUE_DO_NOT_USE_EXTERNALLY", self, self.cooker.configuration.data) bb.data.setVar("__RUNQUEUE_DO_NOT_USE_EXTERNALLY2", fn, self.cooker.configuration.data) |