[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5196/8267] useradd-staticids.bbclass: Support recipes specifying static IDs



commit 6b5502566fa9e3b6313cf40cd62b4e846f1e5103
Author: Peter Kjellerstedt <peter kjellerstedt axis com>
Date:   Wed Mar 15 01:27:13 2017 +0100

    useradd-staticids.bbclass: Support recipes specifying static IDs
    
    If this bbclass is used and a recipe specifies a static ID for a
    user/group as part of the USERADD_PARAM_${PN} or GROUPADD_PARAM_${PN},
    the build would fail with and error like this if there was no
    corresponding ID in the passwd/group files specified via
    USERADD_UID_TABLES/USERADD_GID_TABLES:
    
      ERROR: meta-oe/recipes-support/postgresql/postgresql_9.4.11.bb:
      meta-oe/recipes-support/postgresql/postgresql_9.4.11.bb inherits
      useradd but doesn't set USERADD_PARAM, GROUPADD_PARAM or
      GROUPMEMS_PARAM for package postgresql
    
    (From OE-Core rev: e744fac05fc5cc19cabc59c1e79ff4c1b3ee396d)
    
    Signed-off-by: Peter Kjellerstedt <peter kjellerstedt axis com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/useradd-staticids.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass
index a65c3f6..9b194df 100644
--- a/meta/classes/useradd-staticids.bbclass
+++ b/meta/classes/useradd-staticids.bbclass
@@ -125,6 +125,7 @@ def update_useradd_static_config(d):
             if uaargs.LOGIN not in users:
                 if not uaargs.uid or not uaargs.uid.isdigit() or not uaargs.gid:
                     handle_missing_id(uaargs.LOGIN, 'user', pkg)
+                newparams.append(param)
                 continue
 
             field = users[uaargs.LOGIN]
@@ -260,6 +261,7 @@ def update_useradd_static_config(d):
             if gaargs.GROUP not in groups:
                 if not gaargs.gid or not gaargs.gid.isdigit():
                     handle_missing_id(gaargs.GROUP, 'group', pkg)
+                newparams.append(param)
                 continue
 
             field = groups[gaargs.GROUP]


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]