diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-07-13 15:26:28 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-16 15:08:45 +0100 |
| commit | dd7449114a33c92a2877b1a6f875d812b10856ff (patch) | |
| tree | d0a5a95d38366107391ed1250d5a4e8e3e7ebd26 /meta | |
| parent | 7b064a9dc1dc8c30c7b9982e263a754a144c0a99 (diff) | |
| download | openembedded-core-dd7449114a33c92a2877b1a6f875d812b10856ff.tar.gz openembedded-core-dd7449114a33c92a2877b1a6f875d812b10856ff.tar.bz2 openembedded-core-dd7449114a33c92a2877b1a6f875d812b10856ff.zip | |
classes/useradd: don't read bbnote/bbwarn/bbfatal values
Since these functions now log through BitBake's message logging system
we must have standalone implementations here.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/useradd.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index aae038f6ba..4577e56f5a 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass @@ -191,9 +191,9 @@ fakeroot python populate_packages_prepend () { preinst = d.getVar('pkg_preinst_%s' % pkg, True) or d.getVar('pkg_preinst', True) if not preinst: preinst = '#!/bin/sh\n' - preinst += 'bbnote () {\n%s}\n' % d.getVar('bbnote', True) - preinst += 'bbwarn () {\n%s}\n' % d.getVar('bbwarn', True) - preinst += 'bbfatal () {\n%s}\n' % d.getVar('bbfatal', True) + preinst += 'bbnote () {\n\techo "NOTE: $*"\n}\n' + preinst += 'bbwarn () {\n\techo "WARNING: $*"\n}\n' + preinst += 'bbfatal () {\n\techo "ERROR: $*"\n\texit 1\n}\n' preinst += 'perform_groupadd () {\n%s}\n' % d.getVar('perform_groupadd', True) preinst += 'perform_useradd () {\n%s}\n' % d.getVar('perform_useradd', True) preinst += 'perform_groupmems () {\n%s}\n' % d.getVar('perform_groupmems', True) |