nativesdk-intercept: Fix bad intercept chgrp/chown logic

Running either of these ends up corrupting the os.execv args.

If we run:
./scripts/nativesdk-intercept/chown -R foo:foo bar

The loop here ends up missing the conversion of foo:foo to root:root because
it sees sys.argv[0] and assumes that it's the user:group argument and that we
should convert that. We end up a os.execv(path, args) that have the following
args:

['root:root', '-R', 'foo:foo', 'bar']

As os.execv ignores args[0], we can just populate it with sys.argv[0] and then
loop through sys.argv[1:]. As both chgrp and chown would have either flags and
USER[:GROUP] next, this fixes the issue.

(From OE-Core rev: 2a75f647ec7696d353f4b09099d777ba53f34d36)

Signed-off-by: Eilís 'pidge' Ní Fhlannagáin <pidge@baylibre.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Eilís 'pidge' Ní Fhlannagáin 2023-09-07 11:38:03 +00:00 committed by Richard Purdie
parent a8f3ebc4e0
commit b5dbdfe904
2 changed files with 8 additions and 2 deletions

View File

@ -14,7 +14,10 @@ real_chgrp = shutil.which('chgrp', path=path)
args = list()
found = False
for i in sys.argv:
args.append(real_chgrp)
for i in sys.argv[1:]:
if i.startswith("-"):
args.append(i)
continue

View File

@ -14,7 +14,10 @@ real_chown = shutil.which('chown', path=path)
args = list()
found = False
for i in sys.argv:
args.append(real_chown)
for i in sys.argv[1:]:
if i.startswith("-"):
args.append(i)
continue