diff options
Diffstat (limited to 'bitbake/lib/bb/build.py')
-rw-r--r-- | bitbake/lib/bb/build.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py index 9854553038..e016ae3f40 100644 --- a/bitbake/lib/bb/build.py +++ b/bitbake/lib/bb/build.py | |||
@@ -35,8 +35,7 @@ import stat | |||
35 | import bb | 35 | import bb |
36 | import bb.msg | 36 | import bb.msg |
37 | import bb.process | 37 | import bb.process |
38 | from contextlib import nested | 38 | from bb import data, event, utils |
39 | from bb import event, utils | ||
40 | 39 | ||
41 | bblogger = logging.getLogger('BitBake') | 40 | bblogger = logging.getLogger('BitBake') |
42 | logger = logging.getLogger('BitBake.Build') | 41 | logger = logging.getLogger('BitBake.Build') |
@@ -328,7 +327,7 @@ trap '' 0 | |||
328 | exit $ret | 327 | exit $ret |
329 | ''') | 328 | ''') |
330 | 329 | ||
331 | os.chmod(runfile, 0775) | 330 | os.chmod(runfile, 0o775) |
332 | 331 | ||
333 | cmd = runfile | 332 | cmd = runfile |
334 | if d.getVarFlag(func, 'fakeroot', False): | 333 | if d.getVarFlag(func, 'fakeroot', False): |
@@ -342,12 +341,12 @@ exit $ret | |||
342 | logfile = sys.stdout | 341 | logfile = sys.stdout |
343 | 342 | ||
344 | def readfifo(data): | 343 | def readfifo(data): |
345 | lines = data.split('\0') | 344 | lines = data.split(b'\0') |
346 | for line in lines: | 345 | for line in lines: |
347 | splitval = line.split(' ', 1) | 346 | splitval = line.split(b' ', 1) |
348 | cmd = splitval[0] | 347 | cmd = splitval[0] |
349 | if len(splitval) > 1: | 348 | if len(splitval) > 1: |
350 | value = splitval[1] | 349 | value = splitval[1].decode("utf-8") |
351 | else: | 350 | else: |
352 | value = '' | 351 | value = '' |
353 | if cmd == 'bbplain': | 352 | if cmd == 'bbplain': |
@@ -375,7 +374,7 @@ exit $ret | |||
375 | if os.path.exists(fifopath): | 374 | if os.path.exists(fifopath): |
376 | os.unlink(fifopath) | 375 | os.unlink(fifopath) |
377 | os.mkfifo(fifopath) | 376 | os.mkfifo(fifopath) |
378 | with open(fifopath, 'r+') as fifo: | 377 | with open(fifopath, 'r+b', buffering=0) as fifo: |
379 | try: | 378 | try: |
380 | bb.debug(2, "Executing shell function %s" % func) | 379 | bb.debug(2, "Executing shell function %s" % func) |
381 | 380 | ||