From dd7449114a33c92a2877b1a6f875d812b10856ff Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 13 Jul 2015 15:26:28 +0100 Subject: 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 --- meta/classes/useradd.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/classes/useradd.bbclass') 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) -- cgit 1.2.3-korg