Mercurial > vanilla

annotate core/elogind/patch-musl.patch @ 1220:4ccc42bf0284

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
misc: split .sh with .info
author David Demelier <markand@malikania.fr>
date Thu, 30 Sep 2021 09:26:38 +0200
parents d16175ccb3c3
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1066
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
1 --- meson.build.orig 2019-09-02 16:59:59.363473659 +0200
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
2 +++ meson.build 2019-09-02 17:00:21.687474345 +0200
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
3 @@ -910,51 +910,6 @@
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
4 nobody_user = get_option('nobody-user')
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
5 nobody_group = get_option('nobody-group')
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
6
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
7 -if not meson.is_cross_build()
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
8 - getent_result = run_command('getent', 'passwd', '65534')
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
9 - if getent_result.returncode() == 0
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
10 - name = getent_result.stdout().split(':')[0]
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
11 - if name != nobody_user
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
12 - warning('\n' +
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
13 - 'The local user with the UID 65534 does not match the configured user name "@0@" of the nobody user (its name is @1@).\n'.format(nobody_user, name) +
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
14 - 'Your build will result in an user table setup that is incompatible with the local system.')
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
15 - endif
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
16 - endif
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
17 - id_result = run_command('id', '-u', nobody_user)
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
18 - if id_result.returncode() == 0
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
19 - id = id_result.stdout().to_int()
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
20 - if id != 65534
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
21 - warning('\n' +
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
22 - 'The local user with the configured user name "@0@" of the nobody user does not have UID 65534 (it has @1@).\n'.format(nobody_user, id) +
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
23 - 'Your build will result in an user table setup that is incompatible with the local system.')
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
24 - endif
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
25 - endif
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
26 -
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
27 - getent_result = run_command('getent', 'group', '65534')
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
28 - if getent_result.returncode() == 0
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
29 - name = getent_result.stdout().split(':')[0]
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
30 - if name != nobody_group
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
31 - warning('\n' +
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
32 - 'The local group with the GID 65534 does not match the configured group name "@0@" of the nobody group (its name is @1@).\n'.format(nobody_group, name) +
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
33 - 'Your build will result in an group table setup that is incompatible with the local system.')
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
34 - endif
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
35 - endif
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
36 - id_result = run_command('id', '-g', nobody_group)
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
37 - if id_result.returncode() == 0
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
38 - id = id_result.stdout().to_int()
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
39 - if id != 65534
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
40 - warning('\n' +
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
41 - 'The local group with the configured group name "@0@" of the nobody group does not have UID 65534 (it has @1@).\n'.format(nobody_group, id) +
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
42 - 'Your build will result in an group table setup that is incompatible with the local system.')
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
43 - endif
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
44 - endif
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
45 -endif
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
46 -if nobody_user != nobody_group and not (nobody_user == 'nobody' and nobody_group == 'nogroup')
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
47 - warning('\n' +
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
48 - 'The configured user name "@0@" and group name "@0@" of the nobody user/group are not equivalent.\n'.format(nobody_user, nobody_group) +
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
49 - 'Please re-check that both "nobody-user" and "nobody-group" options are correctly set.')
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
50 -endif
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
51 -
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
52 conf.set_quoted('NOBODY_USER_NAME', nobody_user)
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
53 conf.set_quoted('NOBODY_GROUP_NAME', nobody_group)
d16175ccb3c3 core/elogind: initial import, closes #2265
David Demelier <markand@malikania.fr>
parents:
diff changeset
54 substs.set('NOBODY_USER_NAME', nobody_user)