[OE-core] [PATCH] useradd.bblass: Simplify target overrides

[Mark Hatle]

On 8/8/16 8:48 PM, Ulf Magnusson wrote:
> The current style might be a leftover from when _class-target did not
> exist.
> 
> Also change the assignment to SSTATECLEANFUNCS to an append, which makes
> more sense. useradd.bbclass is the only user of SSTATECLEANFUNCS as of
> writing, so it won't make any functional difference.

Commit is also missing the 'signed-off-by line'.

I don't have any objection.  original version of this was written before
'class-target' existed, thus all of the duplication... nice to get that cleaned up.

--Mark

> ---
>  meta/classes/useradd.bbclass | 31 ++++++++-----------------------
>  1 file changed, 8 insertions(+), 23 deletions(-)
> 
> diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
> index 8d51fb5..25526ef 100644
> --- a/meta/classes/useradd.bbclass
> +++ b/meta/classes/useradd.bbclass
> @@ -3,11 +3,7 @@ inherit useradd_base
>  # base-passwd-cross provides the default passwd and group files in the
>  # target sysroot, and shadow -native and -sysroot provide the utilities
>  # and support files needed to add and modify user and group accounts
> -DEPENDS_append = "${USERADDDEPENDS}"
> -USERADDDEPENDS = " base-files shadow-native shadow-sysroot shadow"
> -USERADDDEPENDS_class-cross = ""
> -USERADDDEPENDS_class-native = ""
> -USERADDDEPENDS_class-nativesdk = ""
> +DEPENDS_append_class-target = " base-files shadow-native shadow-sysroot shadow"
> 
>  # This preinstall function can be run in four different contexts:
>  #
> @@ -157,28 +153,17 @@ if test "x${STAGING_DIR_TARGET}" != "x"; then
>  fi
>  }
> 
> -SSTATECLEANFUNCS = "userdel_sysroot_sstate"
> -SSTATECLEANFUNCS_class-cross = ""
> -SSTATECLEANFUNCS_class-native = ""
> -SSTATECLEANFUNCS_class-nativesdk = ""
> +SSTATECLEANFUNCS_append_class-target = " userdel_sysroot_sstate"
> 
>  do_install[prefuncs] += "${SYSROOTFUNC}"
> -SYSROOTFUNC = "useradd_sysroot"
> -SYSROOTFUNC_class-cross = ""
> -SYSROOTFUNC_class-native = ""
> -SYSROOTFUNC_class-nativesdk = ""
> -SSTATEPREINSTFUNCS += "${SYSROOTPOSTFUNC}"
> -SYSROOTPOSTFUNC = "useradd_sysroot_sstate"
> -SYSROOTPOSTFUNC_class-cross = ""
> -SYSROOTPOSTFUNC_class-native = ""
> -SYSROOTPOSTFUNC_class-nativesdk = ""
> -
> -USERADDSETSCENEDEPS =
> "${MLPREFIX}base-passwd:do_populate_sysroot_setscene
> pseudo-native:do_populate_sysroot_setscene
> shadow-native:do_populate_sysroot_setscene
> ${MLPREFIX}shadow-sysroot:do_populate_sysroot_setscene"
> -USERADDSETSCENEDEPS_class-cross = ""
> -USERADDSETSCENEDEPS_class-native = ""
> -USERADDSETSCENEDEPS_class-nativesdk = ""
> +SYSROOTFUNC_class-target = "useradd_sysroot"
> +SYSROOTFUNC = ""
> +
> +SSTATEPREINSTFUNCS_append_class-target = " useradd_sysroot_sstate"
> +
>  do_package_setscene[depends] += "${USERADDSETSCENEDEPS}"
>  do_populate_sysroot_setscene[depends] += "${USERADDSETSCENEDEPS}"
> +USERADDSETSCENEDEPS_class-target =
> "${MLPREFIX}base-passwd:do_populate_sysroot_setscene
> pseudo-native:do_populate_sysroot_setscene
> shadow-native:do_populate_sysroot_setscene
> ${MLPREFIX}shadow-sysroot:do_populate_sysroot_setscene"
> 
>  # Recipe parse-time sanity checks
>  def update_useradd_after_parse(d):
>