bitbake: bitbake-worker: Preserve network non-local uid
PATCH v2 1/1 bitbake: bitbake-worker: Preserve network non-local uid
In reply to Robert YangThe NIS can't work when network is dissable, so preserve network for it, the error is like:
do_ypcall: clnt_call: RPC: Unable to send; errno = Network is unreachable
Note, enable nscd on the build machine might be a solution, but that isn't reliable since it depends on whether the network function has been cached or not.
--- bitbake/bin/bitbake-worker | 7 +++++-- bitbake/lib/bb/utils.py | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-)
bitbake/bin/bitbake-worker +5 -2
@@ -262,8 +262,11 @@ def fork_off_task(cfg, data, databuilder, workerdata, fn, task, taskname, taskha bb.utils.set_process_name("%s:%s" % (the_data.getVar("PN"), taskname.replace("do_", ""))) if not the_data.getVarFlag(taskname, 'network', False): - logger.debug("Attempting to disable network") - bb.utils.disable_network(uid, gid) + if bb.utils.is_local_uid(uid): + logger.debug("Attempting to disable network for %s" % taskname) + bb.utils.disable_network(uid, gid) + else: + logger.debug("Skipping disable network for %s since %s is not a local uid." % (taskname, uid)) # exported_vars() returns a generator which *cannot* be passed to os.environ.update() # successfully. We also need to unset anything from the environment which shouldn't be there
bitbake/lib/bb/utils.py +16 -0
@@ -1735,3 +1735,19 @@ def environment(**envvars): os.environ[var] = backup[var] else: del os.environ[var] + +def is_local_uid(uid=''): + """ + Check whether uid is a local one or not. + Can't use pwd module since it gets all UIDs, not local ones only. + """ + if not uid: + uid = os.getuid() + with open('/etc/passwd', 'r') as f: + for line in f: + line_split = line.split(':') + if len(line_split) < 3: + continue + if str(uid) == line_split[2]: + return True + return False
Signature · 1 line
2.33.0
v2 cover bitbake: bitbake-worker: Preserve network non-local uid
The following changes since commit 4f24d5daa63feba1849f9c6295597b97c3a42035:
build-appliance-image: Update to master head revision (2022-01-19 23:04:08 +0000)
are available in the Git repository at:
git://github.com/robertlinux/yocto rbt/bb_network
https://github.com/robertlinux/yocto/tree/rbt/bb_network
Robert Yang (1):
bitbake: bitbake-worker: Preserve network non-local uid
bitbake/bin/bitbake-worker | 7 +++++-- bitbake/lib/bb/utils.py | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-)
Signature · 1 line
2.33.0