[oe-commits] Paul Eggleton : classes/useradd: don't read bbnote/bbwarn/bbfatal values
git at git.openembedded.org
git at git.openembedded.org
Mon Jul 20 09:42:06 UTC 2015
Module: openembedded-core.git
Branch: master-next
Commit: dd7449114a33c92a2877b1a6f875d812b10856ff
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=dd7449114a33c92a2877b1a6f875d812b10856ff
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date: Mon Jul 13 15:26:28 2015 +0100
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 at linux.intel.com>
---
meta/classes/useradd.bbclass | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index aae038f..4577e56 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)
More information about the Openembedded-commits
mailing list