| Message ID | 20200124204026.2107-3-alex.bennee@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | None | expand |
On 1/24/20 9:40 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 <alex.bennee@linaro.org> > --- > 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): > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
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):
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 <alex.bennee@linaro.org> --- tests/docker/docker.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)