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:09:23 +0100 |
commit | 546bfe8069cfaffd970ba4f6d7fc29fa8070f319 (patch) | |
tree | 6788d3222835128db4e5f87e19705e7a0822baa4 /meta | |
parent | 09fe2fde3e6f5cc7b0874534e796cbf98d4138d1 (diff) | |
download | poky-546bfe8069cfaffd970ba4f6d7fc29fa8070f319.tar.gz |
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.
(From OE-Core rev: dd7449114a33c92a2877b1a6f875d812b10856ff)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 () { | |||
191 | preinst = d.getVar('pkg_preinst_%s' % pkg, True) or d.getVar('pkg_preinst', True) | 191 | preinst = d.getVar('pkg_preinst_%s' % pkg, True) or d.getVar('pkg_preinst', True) |
192 | if not preinst: | 192 | if not preinst: |
193 | preinst = '#!/bin/sh\n' | 193 | preinst = '#!/bin/sh\n' |
194 | preinst += 'bbnote () {\n%s}\n' % d.getVar('bbnote', True) | 194 | preinst += 'bbnote () {\n\techo "NOTE: $*"\n}\n' |
195 | preinst += 'bbwarn () {\n%s}\n' % d.getVar('bbwarn', True) | 195 | preinst += 'bbwarn () {\n\techo "WARNING: $*"\n}\n' |
196 | preinst += 'bbfatal () {\n%s}\n' % d.getVar('bbfatal', True) | 196 | preinst += 'bbfatal () {\n\techo "ERROR: $*"\n\texit 1\n}\n' |
197 | preinst += 'perform_groupadd () {\n%s}\n' % d.getVar('perform_groupadd', True) | 197 | preinst += 'perform_groupadd () {\n%s}\n' % d.getVar('perform_groupadd', True) |
198 | preinst += 'perform_useradd () {\n%s}\n' % d.getVar('perform_useradd', True) | 198 | preinst += 'perform_useradd () {\n%s}\n' % d.getVar('perform_useradd', True) |
199 | preinst += 'perform_groupmems () {\n%s}\n' % d.getVar('perform_groupmems', True) | 199 | preinst += 'perform_groupmems () {\n%s}\n' % d.getVar('perform_groupmems', True) |