Revert "useradd.bbclass: drop groupmems from sysroot setup"
PATCH 1/2 Revert "useradd.bbclass: drop groupmems from sysroot setup"
This reverts commit de0bf5771644edbe317ee9ad89cca4bc8836cf12.
As long as support for GROUPMEMS_PARAM remains, this code is needed. The lack of the groupmems command is handled in the next commit instead.
Signed-off-by Peter Kjellerstedt <[email protected]>
--- meta/classes/useradd.bbclass | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
meta/classes/useradd.bbclass +6 -1
@@ -131,6 +131,10 @@ usermod_sysroot() { common_useradd_sysroot usermod } +groupmems_sysroot() { + common_useradd_sysroot groupmems +} + common_useradd_sysroot() { # Pseudo may (do_prepare_recipe_sysroot) or may not (do_populate_sysroot_setscene) be running # at this point so we're explicit about the environment so pseudo can load if
@@ -164,6 +168,7 @@ common_useradd_sysroot() { groupadd) GROUPADD_PARAM="${@get_all_cmd_params(d, 'groupadd')}";; useradd) USERADD_PARAM="${@get_all_cmd_params(d, 'useradd')}";; usermod) USERMOD_PARAM="${@get_all_cmd_params(d, 'usermod')}";; + groupmems) GROUPMEMS_PARAM="${@get_all_cmd_params(d, 'groupmems')}";; esac # Tell the system to use the environment vars
@@ -179,7 +184,7 @@ common_useradd_sysroot() { EXTRA_STAGING_FIXMES += "PSEUDO_SYSROOT PSEUDO_LOCALSTATEDIR LOGFIFO" python useradd_sysroot_sstate() { - for cmd, sort_prefix in [("groupadd", "01"), ("useradd", "02"), ("usermod", "03")]: + for cmd, sort_prefix in [("groupadd", "01"), ("useradd", "02"), ("usermod", "03"), ("groupmems", "04")]: scriptfile = None task = d.getVar("BB_CURRENTTASK") if task == "package_setscene":
PATCH 2/2 useradd.bbclass: Look for usermod when using GROUPMEMS_PARAM
Since support for GROUPMEMS_PARAM is implemented using the usermod command, look for it rather than groupmems when verifying that the command exists.
Signed-off-by Peter Kjellerstedt <[email protected]>
--- meta/classes/useradd.bbclass | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
meta/classes/useradd.bbclass +14 -8
@@ -155,22 +155,28 @@ common_useradd_sysroot() { exit 0 fi - # It is also possible we may be in a recipe which doesn't have useradd dependencies and hence the - # useradd/groupadd tools are unavailable. If there is no dependency, we assume we don't want to - # create users in the sysroot - if ! command -v "$1"; then - bbwarn "The $1 command could not be found!" - exit 0 - fi + cmd=$1 # Add groups and users defined for all recipe packages case "$1" in groupadd) GROUPADD_PARAM="${@get_all_cmd_params(d, 'groupadd')}";; useradd) USERADD_PARAM="${@get_all_cmd_params(d, 'useradd')}";; usermod) USERMOD_PARAM="${@get_all_cmd_params(d, 'usermod')}";; - groupmems) GROUPMEMS_PARAM="${@get_all_cmd_params(d, 'groupmems')}";; + groupmems) + GROUPMEMS_PARAM="${@get_all_cmd_params(d, 'groupmems')}" + # groupmems is emulated using usermod + cmd=usermod + ;; esac + # It is also possible we may be in a recipe which doesn't have useradd dependencies and hence the + # useradd/groupadd tools are unavailable. If there is no dependency, we assume we don't want to + # create users in the sysroot + if ! command -v "$cmd"; then + bbwarn "The $cmd command could not be found!" + exit 0 + fi + # Tell the system to use the environment vars UA_SYSROOT=1