diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-05-05 17:18:00 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-09 23:30:15 +0100 |
commit | ec0e1d4fb985361bce79d29afd52d61397d79561 (patch) | |
tree | eb5469218905c932a2943578a23f4919a11ba769 /meta/recipes-devtools/meson/meson/0001-minstall-Correctly-set-uid-gid-of-installed-files.patch | |
parent | 25fdd2816173d48c61cbeb33acbf49cac8c4373d (diff) | |
download | poky-ec0e1d4fb985361bce79d29afd52d61397d79561.tar.gz |
meson: update 0.57.1 -> 0.57.2
(From OE-Core rev: 85345697c6e492598c882eb452b999b8a05f97a9)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/meson/meson/0001-minstall-Correctly-set-uid-gid-of-installed-files.patch')
-rw-r--r-- | meta/recipes-devtools/meson/meson/0001-minstall-Correctly-set-uid-gid-of-installed-files.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/meta/recipes-devtools/meson/meson/0001-minstall-Correctly-set-uid-gid-of-installed-files.patch b/meta/recipes-devtools/meson/meson/0001-minstall-Correctly-set-uid-gid-of-installed-files.patch deleted file mode 100644 index d55b7cc7c7..0000000000 --- a/meta/recipes-devtools/meson/meson/0001-minstall-Correctly-set-uid-gid-of-installed-files.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From 3f6f4964dc79ae986f44afe1687922381f237edd Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Kjellerstedt <pkj@axis.com> | ||
3 | Date: Wed, 3 Mar 2021 12:47:28 +0100 | ||
4 | Subject: [PATCH] minstall: Correctly set uid/gid of installed files | ||
5 | |||
6 | In commit caab4d3d, the uid and gid arguments passed to os.chown() by | ||
7 | set_chown() were accidentally swapped, causing files to end up with | ||
8 | incorrect owner/group if the owner and group are not the same. | ||
9 | |||
10 | Upstream-Status: Backport [https://github.com/mesonbuild/meson/commit/6226ac26ef63335bfb817db02b3f295c78214a82] | ||
11 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | ||
12 | --- | ||
13 | mesonbuild/minstall.py | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py | ||
17 | index 785ff5869..07da408aa 100644 | ||
18 | --- a/mesonbuild/minstall.py | ||
19 | +++ b/mesonbuild/minstall.py | ||
20 | @@ -148,7 +148,7 @@ def set_chown(path: str, user: T.Optional[str] = None, group: T.Optional[str] = | ||
21 | Use a real function rather than a lambda to help mypy out. Also real | ||
22 | functions are faster. | ||
23 | """ | ||
24 | - real_os_chown(path, gid, uid, dir_fd=dir_fd, follow_symlinks=follow_symlinks) | ||
25 | + real_os_chown(path, uid, gid, dir_fd=dir_fd, follow_symlinks=follow_symlinks) | ||
26 | |||
27 | try: | ||
28 | os.chown = chown | ||