Philippe Mathieu-Daudé <[email protected]> writes:
> On 1/30/20 12:32 PM, Alex Bennée wrote: >> When we are copying we want to ensure we grab the first >> resolution (the found in path section). However even that binary might >> be a symlink so lets make sure we chase the symlinks to copy the right >> binary to where it can be found. >> Signed-off-by: Alex Bennée <[email protected]> >> --- >> tests/docker/docker.py | 5 +++-- >> 1 file changed, 3 insertions(+), 2 deletions(-) >> diff --git a/tests/docker/docker.py b/tests/docker/docker.py >> index 31d8adf836..7dfca63fe4 100755 >> --- a/tests/docker/docker.py >> +++ b/tests/docker/docker.py >> @@ -109,7 +109,7 @@ def _get_so_libs(executable): >> ensure theright data is copied.""" >> libs = [] >> - ldd_re = re.compile(r"(/.*/)(\S*)") >> + ldd_re = re.compile(r"(?:\S+ => )?(\S*) \(:?0x[0-9a-f]+\)") >> try: >> ldd_output = subprocess.check_output(["ldd", >> executable]).decode('utf-8') >> for line in ldd_output.split("\n"): >> @@ -145,7 +145,8 @@ def _copy_binary_with_libs(src, bin_dest, dest_dir): >> if libs: >> for l in libs: >> so_path = os.path.dirname(l) >> - _copy_with_mkdir(l, dest_dir, so_path) >> + real_l = os.path.realpath(l) >> + _copy_with_mkdir(real_l, dest_dir, so_path) >> >> def _check_binfmt_misc(executable): >> > > Rob raised an issue in this patch, it appears in a separated thread: > https://www.mail-archive.com/[email protected]/msg675307.html If fixed it up thusly: def _get_so_libs(executable): """Return a list of libraries associated with an executable. The paths may be symbolic links which would need to be resolved to ensure the right data is copied.""" libs = [] ldd_re = re.compile(r"(?:\S+ => )?(\S*) \(:?0x[0-9a-f]+\)") try: ldd_output = subprocess.check_output(["ldd", executable]).decode('utf-8') for line in ldd_output.split("\n"): search = ldd_re.search(line) if search: try: libs.append(s.group(1)) except IndexError: pass except subprocess.CalledProcessError: print("%s had no associated libraries (static build?)" % (executable)) return libs -- Alex Bennée
