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(-)

diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index aafd996fae..c9f24bf7f3 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -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":
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#243779): 
https://lists.openembedded.org/g/openembedded-core/message/243779
Mute This Topic: https://lists.openembedded.org/mt/120833304/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

  • [OE-core] [PATCH 1/2] Revert... Peter Kjellerstedt via lists.openembedded.org

Reply via email to