1 files changed, 1 insertions, 26 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index c168ff5ed4..5f03de8247 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -37,32 +37,7 @@ python sys_path_eh () {
 addhandler sys_path_eh
 die() {
-        oefatal "$*"
+        bbfatal "$*"
-}
-oenote() {
-        echo "NOTE:" "$*"
-}
-oewarn() {
-        echo "WARNING:" "$*"
-}
-oefatal() {
-        echo "FATAL:" "$*"
-        exit 1
-}
-oedebug() {
-        if [ $# -lt 2]; then
-                echo "Usage: oedebug level \"message\""
-                exit 1
-        fi
-        if [ ${OEDEBUG:-0} -ge $1 ]; then
-                shift
-                echo "DEBUG:" $*
-        fi
 }
 oe_runmake() {

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index c168ff5ed4..5f03de8247 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass
@@ -37,32 +37,7 @@ python sys_path_eh () {
37	addhandler sys_path_eh	37	addhandler sys_path_eh
38		38
39	die() {	39	die() {
40	oefatal "$*"	40	bbfatal "$*"
41	}
42
43	oenote() {
44	echo "NOTE:" "$*"
45	}
46
47	oewarn() {
48	echo "WARNING:" "$*"
49	}
50
51	oefatal() {
52	echo "FATAL:" "$*"
53	exit 1
54	}
55
56	oedebug() {
57	if [ $# -lt 2]; then
58	echo "Usage: oedebug level \"message\""
59	exit 1
60	fi
61
62	if [ ${OEDEBUG:-0} -ge $1 ]; then
63	shift
64	echo "DEBUG:" $*
65	fi
66	}	41	}
67		42
68	oe_runmake() {	43	oe_runmake() {