[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4322/8267] useradd-staticids: Fix groupadd

[Emmanuele Bassi <ebassi src gnome org>]

commit fdaa2d181d29dd2198248b011279e2b6acb12f2d
Author: David Vincent <freesilicon gmail com>
Date:   Mon Jan 23 14:55:40 2017 +0100

    useradd-staticids: Fix groupadd
    
    When a group name is duplicated between USERADD_PARAM and
    GROUPADD_PARAM, this class tries to add it twice which results in
    failure of the groupadd command.
    
    (From OE-Core rev: 5b84cc895500c28674d2a7b7c2dd618cf8fb30e9)
    
    Signed-off-by: David Vincent <freesilicon gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/useradd-staticids.bbclass |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass
index f7f6057..a309b88 100644
--- a/meta/classes/useradd-staticids.bbclass
+++ b/meta/classes/useradd-staticids.bbclass
@@ -165,7 +165,9 @@ def update_useradd_static_config(d):
                 if newgroup and is_pkg:
                     groupadd = d.getVar("GROUPADD_PARAM_%s" % pkg)
                     if groupadd:
-                        d.setVar("GROUPADD_PARAM_%s" % pkg, "%s; %s" % (groupadd, newgroup))
+                        # Only add the group if not already specified
+                        if not uaargs.groupname in groupadd:
+                            d.setVar("GROUPADD_PARAM_%s" % pkg, "%s; %s" % (groupadd, newgroup))
                     else:
                         d.setVar("GROUPADD_PARAM_%s" % pkg, newgroup)