diff options
| -rw-r--r-- | meta/classes/sstate.bbclass | 5 | ||||
| -rw-r--r-- | meta/classes/useradd.bbclass | 29 |
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 6f285da6b4..3234e7914c 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -51,6 +51,7 @@ SSTATEPREINSTFUNCS = "" SSTATEPOSTUNPACKFUNCS = "sstate_hardcode_path_unpack" SSTATEPOSTINSTFUNCS = "" EXTRA_STAGING_FIXMES ?= "" +SSTATECLEANFUNCS = "" SIGGEN_LOCKEDSIGS_CHECK_LEVEL ?= 'error' @@ -444,6 +445,10 @@ def sstate_clean(ss, d): stfile.endswith(rm_nohash): oe.path.remove(stfile) + # Removes the users/groups created by the package + for cleanfunc in (d.getVar('SSTATECLEANFUNCS', True) or '').split(): + bb.build.exec_func(cleanfunc, d) + sstate_clean[vardepsexclude] = "SSTATE_MANFILEPREFIX" CLEANFUNCS += "sstate_cleanall" 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 () { fi } +userdel_sysroot_sstate () { +if test "x${STAGING_DIR_TARGET}" != "x"; then + if [ "${BB_CURRENTTASK}" = "configure" -o "${BB_CURRENTTASK}" = "clean" ]; then + export PSEUDO="${FAKEROOTENV} PSEUDO_LOCALSTATEDIR=${STAGING_DIR_TARGET}${localstatedir}/pseudo ${STAGING_DIR_NATIVE}${bindir}/pseudo" + OPT="--root ${STAGING_DIR_TARGET}" + + # Remove groups and users defined for package + GROUPADD_PARAM="${@get_all_cmd_params(d, 'groupadd')}" + USERADD_PARAM="${@get_all_cmd_params(d, 'useradd')}" + + if test "x`echo $USERADD_PARAM | tr -d '[:space:]'`" != "x"; then + user=`echo "$USERADD_PARAM" | cut -d ';' -f 1 | awk '{ print $NF }'` + perform_userdel "${STAGING_DIR_TARGET}" "$OPT $user" + fi + + if test "x`echo $GROUPADD_PARAM | tr -d '[:space:]'`" != "x"; then + group=`echo "$GROUPADD_PARAM" | cut -d ';' -f 1 | awk '{ print $NF }'` + perform_groupdel "${STAGING_DIR_TARGET}" "$OPT $group" + fi + + fi +fi +} + +SSTATECLEANFUNCS = "userdel_sysroot_sstate" +SSTATECLEANFUNCS_class-cross = "" +SSTATECLEANFUNCS_class-native = "" +SSTATECLEANFUNCS_class-nativesdk = "" + do_install[prefuncs] += "${SYSROOTFUNC}" SYSROOTFUNC = "useradd_sysroot" SYSROOTFUNC_class-cross = "" |