diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-19 11:20:31 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-11 23:44:42 +0000 |
commit | 11fba270e740a9e9072a2d0f492cd765df5ac6e4 (patch) | |
tree | f6c34807cc7eef4283a0657769fefb12618ec781 | |
parent | 3b70636be4f6e17caf94e5d1a2c1816374574da6 (diff) | |
download | poky-11fba270e740a9e9072a2d0f492cd765df5ac6e4.tar.gz |
systemd: Ensure uid/gid ranges are set deterministically
meson.build will fall back to greping /etc/login.defs for values of these
if they're not set. Different distros set them (Centos 7/8 does, Ubuntu
does not) so output was not deterministic. Avoid this by setting to the
default values. We now match the vaules from login.defs from shadow.
(From OE-Core rev: 56f57c70fb87beb9a7181df8cb5e7a4a0b5a184a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 77a6ac0ac266d71e4fe67fd332662081f30cd7bf)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/systemd/systemd_244.5.bb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd_244.5.bb b/meta/recipes-core/systemd/systemd_244.5.bb index 66446e2a7c..a648272bc0 100644 --- a/meta/recipes-core/systemd/systemd_244.5.bb +++ b/meta/recipes-core/systemd/systemd_244.5.bb | |||
@@ -216,6 +216,8 @@ EXTRA_OEMESON += "-Dnobody-user=nobody \ | |||
216 | -Drootlibdir=${rootlibdir} \ | 216 | -Drootlibdir=${rootlibdir} \ |
217 | -Drootprefix=${rootprefix} \ | 217 | -Drootprefix=${rootprefix} \ |
218 | -Ddefault-locale=C \ | 218 | -Ddefault-locale=C \ |
219 | -Dsystem-uid-max=999 \ | ||
220 | -Dsystem-gid-max=999 \ | ||
219 | " | 221 | " |
220 | 222 | ||
221 | # Hardcode target binary paths to avoid using paths from sysroot | 223 | # Hardcode target binary paths to avoid using paths from sysroot |