Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | From 5199ae5dec9b8a9c9e20477d5090f1732735fbe2 Mon Sep 17 00:00:00 2001 |
| 2 | From: Chen Qi <Qi.Chen@windriver.com> |
| 3 | Date: Thu, 28 Jun 2018 09:38:12 +0800 |
| 4 | Subject: [PATCH 6/9] remove nobody user/group checking |
| 5 | |
| 6 | Upstream-Status: Inappropriate [OE Specific] |
| 7 | |
| 8 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
| 9 | --- |
| 10 | meson.build | 37 ------------------------------------- |
| 11 | 1 file changed, 37 deletions(-) |
| 12 | |
| 13 | diff --git a/meson.build b/meson.build |
| 14 | index 323146fe1..3bb087fef 100644 |
| 15 | --- a/meson.build |
| 16 | +++ b/meson.build |
| 17 | @@ -681,43 +681,6 @@ substs.set('containeruidbasemax', container_uid_base_max) |
| 18 | nobody_user = get_option('nobody-user') |
| 19 | nobody_group = get_option('nobody-group') |
| 20 | |
| 21 | -getent_result = run_command('getent', 'passwd', '65534') |
| 22 | -if getent_result.returncode() == 0 |
| 23 | - name = getent_result.stdout().split(':')[0] |
| 24 | - if name != nobody_user |
| 25 | - warning('\n' + |
| 26 | - '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) + |
| 27 | - 'Your build will result in an user table setup that is incompatible with the local system.') |
| 28 | - endif |
| 29 | -endif |
| 30 | -id_result = run_command('id', '-u', nobody_user) |
| 31 | -if id_result.returncode() == 0 |
| 32 | - id = id_result.stdout().to_int() |
| 33 | - if id != 65534 |
| 34 | - warning('\n' + |
| 35 | - '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) + |
| 36 | - 'Your build will result in an user table setup that is incompatible with the local system.') |
| 37 | - endif |
| 38 | -endif |
| 39 | - |
| 40 | -getent_result = run_command('getent', 'group', '65534') |
| 41 | -if getent_result.returncode() == 0 |
| 42 | - name = getent_result.stdout().split(':')[0] |
| 43 | - if name != nobody_group |
| 44 | - warning('\n' + |
| 45 | - '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) + |
| 46 | - 'Your build will result in an group table setup that is incompatible with the local system.') |
| 47 | - endif |
| 48 | -endif |
| 49 | -id_result = run_command('id', '-g', nobody_group) |
| 50 | -if id_result.returncode() == 0 |
| 51 | - id = id_result.stdout().to_int() |
| 52 | - if id != 65534 |
| 53 | - warning('\n' + |
| 54 | - '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) + |
| 55 | - 'Your build will result in an group table setup that is incompatible with the local system.') |
| 56 | - endif |
| 57 | -endif |
| 58 | if nobody_user != nobody_group and not (nobody_user == 'nobody' and nobody_group == 'nogroup') |
| 59 | warning('\n' + |
| 60 | 'The configured user name "@0@" and group name "@0@" of the nobody user/group are not equivalent.\n'.format(nobody_user, nobody_group) + |
| 61 | -- |
| 62 | 2.11.0 |
| 63 | |