linux/poky.git/meta/classes/useradd-staticids.bbclass, branch python3

useradd-staticids.bbclass: Remove unnecessary spaces

2016-01-18T11:47:07+00:00

This removes unnecessary spaces inserted before semicolons in the modified USERADD_PARAM_${PN} and GROUPADD_PARAM_${PN} variables. This should not affect the handling of the variables as the only one that actually sees the semicolons is the code in useradd.bbclass that uses cut to split the variables at them, and any whitespace preceeding or following the semicolons will be properly ignored. (From OE-Core rev: acc17ef91a6f506e3cacdc0d4ebfa268b3f3affd) Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie

useradd-staticids.bbclass: Read passwd/group files before parsing

2016-01-18T11:47:06+00:00

Read and merge the passwd/group files before parsing the user and group definitions. This means they will only be read once per recipe. This solves a problem where if a user was definied in multiple files, it could generate group definitions for groups that should not be created. E.g., if the first passwd file read defines a user as: foobar::1234:::: and the second passwd file defines it as: foobar:::nogroup:The foobar user:/:/bin/sh then a foobar group would be created even if the user will use the nogroup as its primary group. (From OE-Core rev: 3149319ad997379a01d87f2b1b5d14f66541997f) Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie

useradd-staticids.bbclass: Simplify the logic for when to add groups

2016-01-18T11:47:06+00:00

The original code was near impossible to follow, and missed a couple of cases. For example, if one added the following line to the passwd file specified in USERADD_UID_TABLES: foobar:x:12345:nogroup::/:/bin/sh and then specified the user as: USERADD_PARAM_${PN} = "--system foobar" one would then assume that the foobar user would be created with the primary group set to nogroup. However, it was not (the primary group would be foobar), and the only way to get it correct was to explicitly add --gid nogroup to the USERADD_PARAM_${PN}. (From OE-Core rev: e98e98ce65cf9ffdef29462310a622ffddd1412b) Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie

useradd-staticids.bbclass: Simplify some logic

2016-01-18T11:47:06+00:00

The [, ][not ] construct may solve the problem of implementing a conditional operator, but it is not very readable. At least I find this: uaargs.groupid = field[3] or uaargs.gid or uaargs.groupname a lot more readable than this: uaargs.groupid = [uaargs.gid, uaargs.groupname][not uaargs.gid] uaargs.groupid = [field[3], uaargs.groupid][not field[3]] Also, the official conditional operator since Python 2.5 ( if else ) does not evaluate both and as [, ][not ] does. (From OE-Core rev: 274d38a6e2183ec88335a08b963f26c34b328558) Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie

useradd-staticids.bbclass: Make --no-user-group have effect

2016-01-18T11:47:06+00:00

If --no-user-group is specified in USERADD_PARAM_${PN} for a user and no --gid is specified, then we should not assume that the group name for the user is the user name. (From OE-Core rev: 0e5402c433739a416a76df532378533cb25365c7) Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie

useradd-staticids.bbclass: Treat mutually exclusive options as such

2016-01-18T11:47:06+00:00

The useradd options --create-home/--no-create-home and --user-group/--no-user-group are mutually exclusive and should be treated as such. (From OE-Core rev: 908eca7fb4af8a60026f53e2bb2cf1d5daf089ab) Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie

useradd-staticids.bbclass: Do not require trailing colons

2015-10-29T07:31:16+00:00

Before, the users and groups specified in the passwd file and the groups file had to have trailing colons to make sure there were enough elements in the definitions, or bitbake would throw a Python exception. After this change one can omit the trailing colons, which especially simplifies passwd files used only to specify static UIDs. (From OE-Core rev: 7754e0f71eb794f0e06a1b005e3824fac4cdac6c) Signed-off-by: Peter Kjellerstedt Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

useradd-staticids.bbclass: Fix for Bug 6633

2014-09-03T15:00:28+00:00

When using the useradd-staticids.bbclass under meta/classes, this error occurs: " - : Username does not have a static uid defined." There was a problem with the regular expression for parsing parameters, it was sometimes returning an empty string. I have fixed this by skipping empty strings. (From OE-Core rev: f249ef32709069a2680b92dc5a5b4f6545d014b7) Signed-off-by: Fabrice Coulon Signed-off-by: Richard Purdie

useradd{-static}: Ignore useradds on nativesdk

2014-03-21T12:05:49+00:00

The code was supposed to ignore both native and nativesdk operations when using the useradd and useradd-static code. However, somewhere along the way the code was dropped. This didn't cause any issues until someone enabled the enforcing mode in the new useradd-static and various nativesdk packages started to fail. (From OE-Core rev: 6b9705892400a1da1fcd973c64d1911c7c4463f6) Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie

useradd-staticids: Adjust USERADD_ERROR_DYNAMIC condition and error message

2014-02-11T12:04:38+00:00

The USERADD_ERROR_DYNAMIC needs to check that both users and groups that are defined need to be represented as static ids, or an error should occur. For the user check, we want to make sure the uid is a numeric value. (The gid can be name, as the GROUPADD check will validate for a number there -- or during install useradd will fail if that group is not defined.) For the group check, we verify that the gid is specified and not left as a name. Also two statements that can be uncommented for debugging were added so that future development work on this code would be easier to do. (From OE-Core rev: f35bbba65e3e41f8dea1f9ff872d3a9fbd84bf6d) Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie