diff options
author | Maxin B. John <maxin.john@intel.com> | 2016-04-06 12:20:31 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-06 22:57:25 +0100 |
commit | cbe33ecb15f71737354184cd9f3b7507ab97b2e4 (patch) | |
tree | d75005bce92d4088cffa9ca30c5dc1dafeaeef33 /meta/classes/useradd.bbclass | |
parent | c1157400ab6f5cb0f057bd07e55c4790499107ed (diff) | |
download | poky-cbe33ecb15f71737354184cd9f3b7507ab97b2e4.tar.gz |
useradd.bbclass: remove user/group created by the package in clean* task
At present, if a recipe is built which creates users/groups via
useradd.bbclass, those users/groups are not removed from sysroot
when the recipe/package is cleaned using clean/cleansstate/cleanall
or when a recipe is rebuild and 'unstaged' from the the sysroot.
The "userdel_sysroot_sstate()" provides that functionality.
[YOCTO #9262]
(From OE-Core rev: b5304ce438666a7418746f4ddd32703ae3188089)
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/useradd.bbclass')
-rw-r--r-- | meta/classes/useradd.bbclass | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index 0a6f2be0d4..ee402acef1 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass | |||
@@ -127,6 +127,35 @@ useradd_sysroot_sstate () { | |||
127 | fi | 127 | fi |
128 | } | 128 | } |
129 | 129 | ||
130 | userdel_sysroot_sstate () { | ||
131 | if test "x${STAGING_DIR_TARGET}" != "x"; then | ||
132 | if [ "${BB_CURRENTTASK}" = "configure" -o "${BB_CURRENTTASK}" = "clean" ]; then | ||
133 | export PSEUDO="${FAKEROOTENV} PSEUDO_LOCALSTATEDIR=${STAGING_DIR_TARGET}${localstatedir}/pseudo ${STAGING_DIR_NATIVE}${bindir}/pseudo" | ||
134 | OPT="--root ${STAGING_DIR_TARGET}" | ||
135 | |||
136 | # Remove groups and users defined for package | ||
137 | GROUPADD_PARAM="${@get_all_cmd_params(d, 'groupadd')}" | ||
138 | USERADD_PARAM="${@get_all_cmd_params(d, 'useradd')}" | ||
139 | |||
140 | if test "x`echo $USERADD_PARAM | tr -d '[:space:]'`" != "x"; then | ||
141 | user=`echo "$USERADD_PARAM" | cut -d ';' -f 1 | awk '{ print $NF }'` | ||
142 | perform_userdel "${STAGING_DIR_TARGET}" "$OPT $user" | ||
143 | fi | ||
144 | |||
145 | if test "x`echo $GROUPADD_PARAM | tr -d '[:space:]'`" != "x"; then | ||
146 | group=`echo "$GROUPADD_PARAM" | cut -d ';' -f 1 | awk '{ print $NF }'` | ||
147 | perform_groupdel "${STAGING_DIR_TARGET}" "$OPT $group" | ||
148 | fi | ||
149 | |||
150 | fi | ||
151 | fi | ||
152 | } | ||
153 | |||
154 | SSTATECLEANFUNCS = "userdel_sysroot_sstate" | ||
155 | SSTATECLEANFUNCS_class-cross = "" | ||
156 | SSTATECLEANFUNCS_class-native = "" | ||
157 | SSTATECLEANFUNCS_class-nativesdk = "" | ||
158 | |||
130 | do_install[prefuncs] += "${SYSROOTFUNC}" | 159 | do_install[prefuncs] += "${SYSROOTFUNC}" |
131 | SYSROOTFUNC = "useradd_sysroot" | 160 | SYSROOTFUNC = "useradd_sysroot" |
132 | SYSROOTFUNC_class-cross = "" | 161 | SYSROOTFUNC_class-cross = "" |