diff options
author | Maxin B. John <maxin.john@intel.com> | 2017-02-28 11:41:15 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-08 11:52:57 +0000 |
commit | d070d151d35ad2adcd5bc84c91d3b14859c4eeba (patch) | |
tree | c26c48a725c7c2e6119073637dacea412c2846e0 | |
parent | dc80d4f4bcfc626659adc96cf777ea2c08934b9b (diff) | |
download | poky-d070d151d35ad2adcd5bc84c91d3b14859c4eeba.tar.gz |
useradd.bbclass: drop obsolete code
Cleanup useradd class by removing the code made obsolete by
the introduction of Recipe Specific Sysroot.
(From OE-Core rev: 2c126e704ebb58afc0d79fe220dc370e09d6bfd5)
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/useradd.bbclass | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index 326c04d0b1..1f7afa4f8e 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass | |||
@@ -132,38 +132,6 @@ python useradd_sysroot_sstate () { | |||
132 | bb.build.exec_func("useradd_sysroot", d) | 132 | bb.build.exec_func("useradd_sysroot", d) |
133 | } | 133 | } |
134 | 134 | ||
135 | userdel_sysroot_sstate () { | ||
136 | if test "x${STAGING_DIR_TARGET}" != "x"; then | ||
137 | if [ "${BB_CURRENTTASK}" = "clean" ]; then | ||
138 | export PSEUDO="${FAKEROOTENV} PSEUDO_LOCALSTATEDIR=${STAGING_DIR_TARGET}${localstatedir}/pseudo ${PSEUDO_SYSROOT}${bindir_native}/pseudo" | ||
139 | OPT="--root ${STAGING_DIR_TARGET}" | ||
140 | |||
141 | # Remove groups and users defined for package | ||
142 | GROUPADD_PARAM="${@get_all_cmd_params(d, 'groupadd')}" | ||
143 | USERADD_PARAM="${@get_all_cmd_params(d, 'useradd')}" | ||
144 | |||
145 | user=`echo "$USERADD_PARAM" | cut -d ';' -f 1 | awk '{ print $NF }'` | ||
146 | remaining=`echo "$USERADD_PARAM" | cut -d ';' -f 2- -s | sed -e 's#[ \t]*$##'` | ||
147 | while test "x$user" != "x"; do | ||
148 | perform_userdel "${STAGING_DIR_TARGET}" "$OPT $user" | ||
149 | user=`echo "$remaining" | cut -d ';' -f 1 | awk '{ print $NF }'` | ||
150 | remaining=`echo "$remaining" | cut -d ';' -f 2- -s | sed -e 's#[ \t]*$##'` | ||
151 | done | ||
152 | |||
153 | user=`echo "$GROUPADD_PARAM" | cut -d ';' -f 1 | awk '{ print $NF }'` | ||
154 | remaining=`echo "$GROUPADD_PARAM" | cut -d ';' -f 2- -s | sed -e 's#[ \t]*$##'` | ||
155 | while test "x$user" != "x"; do | ||
156 | perform_groupdel "${STAGING_DIR_TARGET}" "$OPT $user" | ||
157 | user=`echo "$remaining" | cut -d ';' -f 1 | awk '{ print $NF }'` | ||
158 | remaining=`echo "$remaining" | cut -d ';' -f 2- -s | sed -e 's#[ \t]*$##'` | ||
159 | done | ||
160 | |||
161 | fi | ||
162 | fi | ||
163 | } | ||
164 | |||
165 | #SSTATECLEANFUNCS_append_class-target = " userdel_sysroot_sstate" | ||
166 | |||
167 | do_prepare_recipe_sysroot[postfuncs] += "${SYSROOTFUNC}" | 135 | do_prepare_recipe_sysroot[postfuncs] += "${SYSROOTFUNC}" |
168 | SYSROOTFUNC_class-target = "useradd_sysroot_sstate" | 136 | SYSROOTFUNC_class-target = "useradd_sysroot_sstate" |
169 | SYSROOTFUNC = "" | 137 | SYSROOTFUNC = "" |