mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: bitbake-worker: allow '=' in environment variable values

Browse Source 
Limit the split to key & value (2 items) instead of the n items one
can get if there are '=' characters in the value.

Fixes [YOCTO #15447]

(Bitbake rev: 86315961829ab1d137a0265cc246c44d3929e1fb)

Signed-off-by: david d zuhn <david.zuhn@sonos.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
david d zuhn
2024-03-18 13:50:05 -05:00
committed by Richard Purdie
parent 0acdb81ca6
commit ecb1248914
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/bin/bitbake-worker
+2 -2
View File
@@ -183,7 +183,7 @@ def fork_off_task(cfg, data, databuilder, workerdata, extraconfigdata, runtask):
if 'fakeroot' in taskdep and taskname in taskdep['fakeroot'] and not dry_run: if 'fakeroot' in taskdep and taskname in taskdep['fakeroot'] and not dry_run:
fakeroot = True fakeroot = True
envvars = (runtask['fakerootenv'] or "").split() envvars = (runtask['fakerootenv'] or "").split()
for key, value in (var.split('=') for var in envvars): for key, value in (var.split('=',1) for var in envvars):
envbackup[key] = os.environ.get(key) envbackup[key] = os.environ.get(key)
os.environ[key] = value os.environ[key] = value
fakeenv[key] = value fakeenv[key] = value
@@ -195,7 +195,7 @@ def fork_off_task(cfg, data, databuilder, workerdata, extraconfigdata, runtask):
(fn, taskname, ', '.join(fakedirs))) (fn, taskname, ', '.join(fakedirs)))
else: else:
envvars = (runtask['fakerootnoenv'] or "").split() envvars = (runtask['fakerootnoenv'] or "").split()
for key, value in (var.split('=') for var in envvars): for key, value in (var.split('=',1) for var in envvars):
envbackup[key] = os.environ.get(key) envbackup[key] = os.environ.get(key)
os.environ[key] = value os.environ[key] = value
fakeenv[key] = value fakeenv[key] = value
bitbake/lib/bb/runqueue.py
+1 -1
View File
@@ -1359,7 +1359,7 @@ class RunQueue:
fakerootcmd = shlex.split(mcdata.getVar("FAKEROOTCMD")) fakerootcmd = shlex.split(mcdata.getVar("FAKEROOTCMD"))
fakerootenv = (mcdata.getVar("FAKEROOTBASEENV") or "").split() fakerootenv = (mcdata.getVar("FAKEROOTBASEENV") or "").split()
env = os.environ.copy() env = os.environ.copy()
for key, value in (var.split('=') for var in fakerootenv): for key, value in (var.split('=',1) for var in fakerootenv):
env[key] = value env[key] = value
worker = subprocess.Popen(fakerootcmd + [sys.executable, workerscript, magic], stdout=subprocess.PIPE, stdin=subprocess.PIPE, env=env) worker = subprocess.Popen(fakerootcmd + [sys.executable, workerscript, magic], stdout=subprocess.PIPE, stdin=subprocess.PIPE, env=env)
fakerootlogs = self.rqdata.dataCaches[mc].fakerootlogs fakerootlogs = self.rqdata.dataCaches[mc].fakerootlogs