[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 1/7] tests/docker: fix copying of executable in "update"
From: |
Alex Bennée |
Subject: |
[PATCH v1 1/7] tests/docker: fix copying of executable in "update" |
Date: |
Wed, 10 Mar 2021 19:23:25 +0000 |
We have the same symlink chasing problem when doing an "update"
operation. Fix that.
Based-on: 5e33f7fead ("tests/docker: better handle symlinked libs")
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/docker/docker.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index d28df4c140..0435a55d10 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -548,7 +548,14 @@ def run(self, args, argv):
libs = _get_so_libs(args.executable)
if libs:
for l in libs:
- tmp_tar.add(os.path.realpath(l), arcname=l)
+ so_path = os.path.dirname(l)
+ name = os.path.basename(l)
+ real_l = os.path.realpath(l)
+ try:
+ tmp_tar.add(real_l, arcname="%s/%s" % (so_path, name))
+ except FileNotFoundError:
+ print("Couldn't add %s/%s to archive" % (so_path, name))
+ pass
# Create a Docker buildfile
df = StringIO()
--
2.20.1
- [PATCH v1 0/7] testing/next (hexagon 2, electric boogaloo), Alex Bennée, 2021/03/10
- [PATCH v1 2/7] tests/docker: make executable an optional argument to "update", Alex Bennée, 2021/03/10
- [PATCH v1 6/7] tests/tcg: Use Hexagon Docker image, Alex Bennée, 2021/03/10
- [PATCH v1 3/7] tests/docker: allow "update" to add the current user, Alex Bennée, 2021/03/10
- [PATCH v1 1/7] tests/docker: fix copying of executable in "update",
Alex Bennée <=
- [PATCH v1 5/7] docker: Add Hexagon image, Alex Bennée, 2021/03/10
- [PATCH v1 4/7] tests/docker: add "fetch" sub-command, Alex Bennée, 2021/03/10
- [PATCH v1 7/7] gitlab: add build-user-hexagon test, Alex Bennée, 2021/03/10
- Re: [PATCH v1 0/7] testing/next (hexagon 2, electric boogaloo), no-reply, 2021/03/10