diff options
Diffstat (limited to 'bitbake/lib')
| -rw-r--r-- | bitbake/lib/bb/cache.py | 3 | ||||
| -rw-r--r-- | bitbake/lib/bb/runqueue.py | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index d495f9e..fe35e13 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py @@ -143,6 +143,7 @@ class CoreRecipeInfo(RecipeInfoCommon): self.section = self.getvar('SECTION', metadata) self.fakerootenv = self.getvar('FAKEROOTENV', metadata) self.fakerootdirs = self.getvar('FAKEROOTDIRS', metadata) + self.fakerootnoenv = self.getvar('FAKEROOTNOENV', metadata) @classmethod def init_cacheData(cls, cachedata): @@ -178,6 +179,7 @@ class CoreRecipeInfo(RecipeInfoCommon): cachedata.license = {} cachedata.section = {} cachedata.fakerootenv = {} + cachedata.fakerootnoenv = {} cachedata.fakerootdirs = {} def add_cacheData(self, cachedata, fn): @@ -243,6 +245,7 @@ class CoreRecipeInfo(RecipeInfoCommon): cachedata.license[fn] = self.license cachedata.section[fn] = self.section cachedata.fakerootenv[fn] = self.fakerootenv + cachedata.fakerootnoenv[fn] = self.fakerootnoenv cachedata.fakerootdirs[fn] = self.fakerootdirs diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index aca06b5..d0d6f3a 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -1096,6 +1096,12 @@ class RunQueueExecute: logger.debug(2, 'Running %s:%s under fakeroot, fakedirs: %s' % (fn, taskname, ', '.join(fakedirs))) + else: + envvars = (self.rqdata.dataCache.fakerootnoenv[fn] or "").split() + for key, value in (var.split('=') for var in envvars): + envbackup[key] = os.environ.get(key) + os.environ[key] = value + fakeenv[key] = value sys.stdout.flush() sys.stderr.flush() |
