summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2011-04-28 21:49:31 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-04 00:54:37 +0100
commitfc934af7c843a899f41d43fdb239d255da777903 (patch)
treeb3a9391af053141103455de4661f059e91bea035 /meta
parent0e2eb05f46192e179912160cc557f274148dcf15 (diff)
downloadpoky-fc934af7c843a899f41d43fdb239d255da777903.tar.gz
logging: update existing oe* logging users to the bb* interface
The new bash logging class provides bbnote, bbwarn, bbfatal, and bbdebug replacements (as well as bbplain and bberror) for the oe* equivalents. Use the new bb* API in preparation to delete the oe* logging API. This patch was automatically generated by a sed script. The result has been visually inspected and used to build core-image-sato for qemux86. (From OE-Core rev: a1f09fce5caba389d0484b169f0cde85d64514fa) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/autotools.bbclass16
-rw-r--r--meta/classes/base.bbclass4
-rw-r--r--meta/classes/distutils.bbclass8
-rw-r--r--meta/classes/kernel.bbclass4
-rw-r--r--meta/classes/qmake_base.bbclass10
-rw-r--r--meta/classes/scons.bbclass4
-rw-r--r--meta/classes/sip.bbclass4
-rw-r--r--meta/classes/sourcepkg.bbclass4
-rw-r--r--meta/classes/srec.bbclass2
-rw-r--r--meta/classes/utils.bbclass20
-rw-r--r--meta/recipes-core/dropbear/dropbear.inc2
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.12.bb2
-rw-r--r--meta/recipes-core/glibc/glibc_2.10.1.bb2
-rw-r--r--meta/recipes-devtools/python/python_2.6.6.bb2
14 files changed, 42 insertions, 42 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index cbd2e9666e..27f4a01f12 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -70,10 +70,10 @@ oe_runconf () {
70 if [ -x ${S}/configure ] ; then 70 if [ -x ${S}/configure ] ; then
71 cfgcmd="${S}/configure \ 71 cfgcmd="${S}/configure \
72 ${CONFIGUREOPTS} ${EXTRA_OECONF} $@" 72 ${CONFIGUREOPTS} ${EXTRA_OECONF} $@"
73 oenote "Running $cfgcmd..." 73 bbnote "Running $cfgcmd..."
74 $cfgcmd || oefatal "oe_runconf failed" 74 $cfgcmd || bbfatal "oe_runconf failed"
75 else 75 else
76 oefatal "no configure script found" 76 bbfatal "no configure script found"
77 fi 77 fi
78} 78}
79 79
@@ -132,7 +132,7 @@ autotools_do_configure() {
132 if grep "sed.*POTFILES" $CONFIGURE_AC >/dev/null; then 132 if grep "sed.*POTFILES" $CONFIGURE_AC >/dev/null; then
133 : do nothing -- we still have an old unmodified configure.ac 133 : do nothing -- we still have an old unmodified configure.ac
134 else 134 else
135 oenote Executing glib-gettextize --force --copy 135 bbnote Executing glib-gettextize --force --copy
136 echo "no" | glib-gettextize --force --copy 136 echo "no" | glib-gettextize --force --copy
137 fi 137 fi
138 else if grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then 138 else if grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
@@ -142,11 +142,11 @@ autotools_do_configure() {
142 fi 142 fi
143 mkdir -p m4 143 mkdir -p m4
144 if grep "^[[:space:]]*[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then 144 if grep "^[[:space:]]*[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then
145 oenote Executing intltoolize --copy --force --automake 145 bbnote Executing intltoolize --copy --force --automake
146 intltoolize --copy --force --automake 146 intltoolize --copy --force --automake
147 fi 147 fi
148 oenote Executing autoreconf --verbose --install --force ${EXTRA_AUTORECONF} $acpaths 148 bbnote Executing autoreconf --verbose --install --force ${EXTRA_AUTORECONF} $acpaths
149 autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || oefatal "autoreconf execution failed." 149 autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || bbfatal "autoreconf execution failed."
150 cd $olddir 150 cd $olddir
151 fi 151 fi
152 ;; 152 ;;
@@ -154,7 +154,7 @@ autotools_do_configure() {
154 if [ -e ${S}/configure ]; then 154 if [ -e ${S}/configure ]; then
155 oe_runconf 155 oe_runconf
156 else 156 else
157 oenote "nothing to configure" 157 bbnote "nothing to configure"
158 fi 158 fi
159} 159}
160 160
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 3b83e42bf6..c168ff5ed4 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -67,7 +67,7 @@ oedebug() {
67 67
68oe_runmake() { 68oe_runmake() {
69 if [ x"$MAKE" = x ]; then MAKE=make; fi 69 if [ x"$MAKE" = x ]; then MAKE=make; fi
70 oenote ${MAKE} ${EXTRA_OEMAKE} "$@" 70 bbnote ${MAKE} ${EXTRA_OEMAKE} "$@"
71 ${MAKE} ${EXTRA_OEMAKE} "$@" || die "oe_runmake failed" 71 ${MAKE} ${EXTRA_OEMAKE} "$@" || die "oe_runmake failed"
72} 72}
73 73
@@ -231,7 +231,7 @@ base_do_compile() {
231 if [ -e Makefile -o -e makefile ]; then 231 if [ -e Makefile -o -e makefile ]; then
232 oe_runmake || die "make failed" 232 oe_runmake || die "make failed"
233 else 233 else
234 oenote "nothing to compile" 234 bbnote "nothing to compile"
235 fi 235 fi
236} 236}
237 237
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index 7e6fbc0c06..79b962a360 100644
--- a/meta/classes/distutils.bbclass
+++ b/meta/classes/distutils.bbclass
@@ -12,14 +12,14 @@ distutils_do_compile() {
12 STAGING_LIBDIR=${STAGING_LIBDIR} \ 12 STAGING_LIBDIR=${STAGING_LIBDIR} \
13 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 13 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
14 ${STAGING_BINDIR_NATIVE}/python setup.py build ${DISTUTILS_BUILD_ARGS} || \ 14 ${STAGING_BINDIR_NATIVE}/python setup.py build ${DISTUTILS_BUILD_ARGS} || \
15 oefatal "python setup.py build_ext execution failed." 15 bbfatal "python setup.py build_ext execution failed."
16} 16}
17 17
18distutils_stage_headers() { 18distutils_stage_headers() {
19 install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} 19 install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
20 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 20 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
21 ${STAGING_BINDIR_NATIVE}/python setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \ 21 ${STAGING_BINDIR_NATIVE}/python setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
22 oefatal "python setup.py install_headers execution failed." 22 bbfatal "python setup.py install_headers execution failed."
23} 23}
24 24
25distutils_stage_all() { 25distutils_stage_all() {
@@ -29,7 +29,7 @@ distutils_stage_all() {
29 PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \ 29 PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \
30 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 30 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
31 ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ 31 ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
32 oefatal "python setup.py install (stage) execution failed." 32 bbfatal "python setup.py install (stage) execution failed."
33} 33}
34 34
35distutils_do_install() { 35distutils_do_install() {
@@ -39,7 +39,7 @@ distutils_do_install() {
39 PYTHONPATH=${D}/${PYTHON_SITEPACKAGES_DIR} \ 39 PYTHONPATH=${D}/${PYTHON_SITEPACKAGES_DIR} \
40 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 40 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
41 ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_INSTALL_ARGS} || \ 41 ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_INSTALL_ARGS} || \
42 oefatal "python setup.py install execution failed." 42 bbfatal "python setup.py install execution failed."
43 43
44 for i in `find ${D} -name "*.py"` ; do \ 44 for i in `find ${D} -name "*.py"` ; do \
45 sed -i -e s:${D}::g $i 45 sed -i -e s:${D}::g $i
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index fd1c8e31c1..70a782fbaf 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -84,7 +84,7 @@ do_compile_kernelmodules() {
84 if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then 84 if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
85 oe_runmake modules CC="${KERNEL_CC}" LD="${KERNEL_LD}" 85 oe_runmake modules CC="${KERNEL_CC}" LD="${KERNEL_LD}"
86 else 86 else
87 oenote "no modules to compile" 87 bbnote "no modules to compile"
88 fi 88 fi
89} 89}
90addtask compile_kernelmodules after do_compile before do_install 90addtask compile_kernelmodules after do_compile before do_install
@@ -97,7 +97,7 @@ kernel_do_install() {
97 if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then 97 if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
98 oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install 98 oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
99 else 99 else
100 oenote "no modules to install" 100 bbnote "no modules to install"
101 fi 101 fi
102 102
103 # 103 #
diff --git a/meta/classes/qmake_base.bbclass b/meta/classes/qmake_base.bbclass
index ea8903c278..24a0f11f46 100644
--- a/meta/classes/qmake_base.bbclass
+++ b/meta/classes/qmake_base.bbclass
@@ -39,7 +39,7 @@ qmake_base_do_configure() {
39 die Unsupported target ${TARGET_OS} for oe-g++ qmake spec 39 die Unsupported target ${TARGET_OS} for oe-g++ qmake spec
40 ;; 40 ;;
41 *) 41 *)
42 oenote Searching for qmake spec file 42 bbnote Searching for qmake spec file
43 paths="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-${TARGET_ARCH}-g++" 43 paths="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-${TARGET_ARCH}-g++"
44 paths="${QMAKE_MKSPEC_PATH}/${TARGET_OS}-g++ $paths" 44 paths="${QMAKE_MKSPEC_PATH}/${TARGET_OS}-g++ $paths"
45 45
@@ -55,7 +55,7 @@ qmake_base_do_configure() {
55 ;; 55 ;;
56 esac 56 esac
57 57
58 oenote "using qmake spec in ${QMAKESPEC}, using profiles '${QMAKE_PROFILES}'" 58 bbnote "using qmake spec in ${QMAKESPEC}, using profiles '${QMAKE_PROFILES}'"
59 59
60 if [ -z "${QMAKE_PROFILES}" ]; then 60 if [ -z "${QMAKE_PROFILES}" ]; then
61 PROFILES="`ls *.pro`" 61 PROFILES="`ls *.pro`"
@@ -70,15 +70,15 @@ qmake_base_do_configure() {
70 if [ ! -z "${EXTRA_QMAKEVARS_POST}" ]; then 70 if [ ! -z "${EXTRA_QMAKEVARS_POST}" ]; then
71 AFTER="-after" 71 AFTER="-after"
72 QMAKE_VARSUBST_POST="${EXTRA_QMAKEVARS_POST}" 72 QMAKE_VARSUBST_POST="${EXTRA_QMAKEVARS_POST}"
73 oenote "qmake postvar substitution: ${EXTRA_QMAKEVARS_POST}" 73 bbnote "qmake postvar substitution: ${EXTRA_QMAKEVARS_POST}"
74 fi 74 fi
75 75
76 if [ ! -z "${EXTRA_QMAKEVARS_PRE}" ]; then 76 if [ ! -z "${EXTRA_QMAKEVARS_PRE}" ]; then
77 QMAKE_VARSUBST_PRE="${EXTRA_QMAKEVARS_PRE}" 77 QMAKE_VARSUBST_PRE="${EXTRA_QMAKEVARS_PRE}"
78 oenote "qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}" 78 bbnote "qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}"
79 fi 79 fi
80 80
81#oenote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'" 81#bbnote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'"
82 unset QMAKESPEC || true 82 unset QMAKESPEC || true
83 ${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling ${OE_QMAKE_QMAKE} on $PROFILES" 83 ${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling ${OE_QMAKE_QMAKE} on $PROFILES"
84} 84}
diff --git a/meta/classes/scons.bbclass b/meta/classes/scons.bbclass
index 534b3bd4c7..211746fd0f 100644
--- a/meta/classes/scons.bbclass
+++ b/meta/classes/scons.bbclass
@@ -2,12 +2,12 @@ DEPENDS += "python-scons-native"
2 2
3scons_do_compile() { 3scons_do_compile() {
4 ${STAGING_BINDIR_NATIVE}/scons PREFIX=${prefix} prefix=${prefix} || \ 4 ${STAGING_BINDIR_NATIVE}/scons PREFIX=${prefix} prefix=${prefix} || \
5 oefatal "scons build execution failed." 5 bbfatal "scons build execution failed."
6} 6}
7 7
8scons_do_install() { 8scons_do_install() {
9 ${STAGING_BINDIR_NATIVE}/scons PREFIX=${D}${prefix} prefix=${D}${prefix} install || \ 9 ${STAGING_BINDIR_NATIVE}/scons PREFIX=${D}${prefix} prefix=${D}${prefix} install || \
10 oefatal "scons install execution failed." 10 bbfatal "scons install execution failed."
11} 11}
12 12
13EXPORT_FUNCTIONS do_compile do_install 13EXPORT_FUNCTIONS do_compile do_install
diff --git a/meta/classes/sip.bbclass b/meta/classes/sip.bbclass
index a258fda629..de0e2effb1 100644
--- a/meta/classes/sip.bbclass
+++ b/meta/classes/sip.bbclass
@@ -17,7 +17,7 @@ sip_do_generate() {
17 if [ -z "$MODULES" ]; then 17 if [ -z "$MODULES" ]; then
18 die "SIP_MODULES not set and no modules found in $PWD" 18 die "SIP_MODULES not set and no modules found in $PWD"
19 else 19 else
20 oenote "using modules '${SIP_MODULES}' and tags '${EXTRA_SIPTAGS}'" 20 bbnote "using modules '${SIP_MODULES}' and tags '${EXTRA_SIPTAGS}'"
21 fi 21 fi
22 22
23 if [ -z "${EXTRA_SIPTAGS}" ]; then 23 if [ -z "${EXTRA_SIPTAGS}" ]; then
@@ -28,7 +28,7 @@ sip_do_generate() {
28 28
29 if [ ! -z "${SIP_FEATURES}" ]; then 29 if [ ! -z "${SIP_FEATURES}" ]; then
30 FEATURES="-z ${SIP_FEATURES}" 30 FEATURES="-z ${SIP_FEATURES}"
31 oenote "sip feature file: ${SIP_FEATURES}" 31 bbnote "sip feature file: ${SIP_FEATURES}"
32 fi 32 fi
33 33
34 for module in $MODULES 34 for module in $MODULES
diff --git a/meta/classes/sourcepkg.bbclass b/meta/classes/sourcepkg.bbclass
index f12a1955d4..64e6d7c860 100644
--- a/meta/classes/sourcepkg.bbclass
+++ b/meta/classes/sourcepkg.bbclass
@@ -39,7 +39,7 @@ sourcepkg_do_create_orig_tgz(){
39 src_tree=${@get_src_tree(d)} 39 src_tree=${@get_src_tree(d)}
40 40
41 echo $src_tree 41 echo $src_tree
42 oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz" 42 bbnote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz"
43 tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree 43 tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree
44 tar -cf - -C $src_tree -ps . | tar -xf - -C $src_tree.orig 44 tar -cf - -C $src_tree -ps . | tar -xf - -C $src_tree.orig
45} 45}
@@ -93,7 +93,7 @@ sourcepkg_do_create_diff_gz(){
93 cp $i $src_tree/${DISTRO}/files 93 cp $i $src_tree/${DISTRO}/files
94 done 94 done
95 95
96 oenote "Creating .diff.gz in ${DEPLOY_DIR_SRC}/${P}-${PR}.diff.gz" 96 bbnote "Creating .diff.gz in ${DEPLOY_DIR_SRC}/${P}-${PR}.diff.gz"
97 LC_ALL=C TZ=UTC0 diff --exclude-from=temp/exclude-from-file -Naur $src_tree.orig $src_tree | gzip -c > ${DEPLOY_DIR_SRC}/${P}-${PR}.diff.gz 97 LC_ALL=C TZ=UTC0 diff --exclude-from=temp/exclude-from-file -Naur $src_tree.orig $src_tree | gzip -c > ${DEPLOY_DIR_SRC}/${P}-${PR}.diff.gz
98 rm -rf $src_tree.orig 98 rm -rf $src_tree.orig
99} 99}
diff --git a/meta/classes/srec.bbclass b/meta/classes/srec.bbclass
index a869a4f1f3..390d5abb3a 100644
--- a/meta/classes/srec.bbclass
+++ b/meta/classes/srec.bbclass
@@ -14,7 +14,7 @@ do_srec[nostamp] = "1"
14 14
15do_srec () { 15do_srec () {
16 if [ ${SREC_VMAADDR} = "" ] ; then 16 if [ ${SREC_VMAADDR} = "" ] ; then
17 oefatal Cannot do_srec without SREC_VMAADDR defined. 17 bbfatal Cannot do_srec without SREC_VMAADDR defined.
18 fi 18 fi
19 for type in ${IMAGE_FSTYPES}; do 19 for type in ${IMAGE_FSTYPES}; do
20 for skiptype in ${SREC_SKIP}; do 20 for skiptype in ${SREC_SKIP}; do
diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass
index e923789c14..6bcaf86b05 100644
--- a/meta/classes/utils.bbclass
+++ b/meta/classes/utils.bbclass
@@ -91,7 +91,7 @@ oe_soinstall() {
91 # 91 #
92 # oe_ 92 # oe_
93 # 93 #
94 #oenote installing shared library $1 to $2 94 #bbnote installing shared library $1 to $2
95 # 95 #
96 libname=`basename $1` 96 libname=`basename $1`
97 install -m 755 $1 $2/$libname 97 install -m 755 $1 $2/$libname
@@ -129,7 +129,7 @@ oe_libinstall() {
129 require_shared=1 129 require_shared=1
130 ;; 130 ;;
131 -*) 131 -*)
132 oefatal "oe_libinstall: unknown option: $1" 132 bbfatal "oe_libinstall: unknown option: $1"
133 ;; 133 ;;
134 *) 134 *)
135 break; 135 break;
@@ -142,7 +142,7 @@ oe_libinstall() {
142 shift 142 shift
143 destpath="$1" 143 destpath="$1"
144 if [ -z "$destpath" ]; then 144 if [ -z "$destpath" ]; then
145 oefatal "oe_libinstall: no destination path specified" 145 bbfatal "oe_libinstall: no destination path specified"
146 fi 146 fi
147 if echo "$destpath/" | egrep '^${STAGING_LIBDIR}/' >/dev/null 147 if echo "$destpath/" | egrep '^${STAGING_LIBDIR}/' >/dev/null
148 then 148 then
@@ -165,7 +165,7 @@ oe_libinstall() {
165 # Sanity check that the libname.lai is unique 165 # Sanity check that the libname.lai is unique
166 number_of_files=`(cd $dir; find . -name "$dotlai") | wc -l` 166 number_of_files=`(cd $dir; find . -name "$dotlai") | wc -l`
167 if [ $number_of_files -gt 1 ]; then 167 if [ $number_of_files -gt 1 ]; then
168 oefatal "oe_libinstall: $dotlai is not unique in $dir" 168 bbfatal "oe_libinstall: $dotlai is not unique in $dir"
169 fi 169 fi
170 170
171 171
@@ -209,7 +209,7 @@ oe_libinstall() {
209 for f in $files; do 209 for f in $files; do
210 if [ ! -e "$f" ]; then 210 if [ ! -e "$f" ]; then
211 if [ -n "$libtool" ]; then 211 if [ -n "$libtool" ]; then
212 oefatal "oe_libinstall: $dir/$f not found." 212 bbfatal "oe_libinstall: $dir/$f not found."
213 fi 213 fi
214 elif [ -L "$f" ]; then 214 elif [ -L "$f" ]; then
215 __runcmd cp -P "$f" $destpath/ 215 __runcmd cp -P "$f" $destpath/
@@ -223,7 +223,7 @@ oe_libinstall() {
223 223
224 if [ -z "$libfile" ]; then 224 if [ -z "$libfile" ]; then
225 if [ -n "$require_shared" ]; then 225 if [ -n "$require_shared" ]; then
226 oefatal "oe_libinstall: unable to locate shared library" 226 bbfatal "oe_libinstall: unable to locate shared library"
227 fi 227 fi
228 elif [ -z "$libtool" ]; then 228 elif [ -z "$libtool" ]; then
229 # special case hack for non-libtool .so.#.#.# links 229 # special case hack for non-libtool .so.#.#.# links
@@ -256,17 +256,17 @@ oe_machinstall() {
256 256
257 for o in `echo ${OVERRIDES} | tr ':' ' '`; do 257 for o in `echo ${OVERRIDES} | tr ':' ' '`; do
258 if [ -e $dirname/$o/$filename ]; then 258 if [ -e $dirname/$o/$filename ]; then
259 oenote $dirname/$o/$filename present, installing to $4 259 bbnote $dirname/$o/$filename present, installing to $4
260 install $1 $2 $dirname/$o/$filename $4 260 install $1 $2 $dirname/$o/$filename $4
261 return 261 return
262 fi 262 fi
263 done 263 done
264# oenote overrides specific file NOT present, trying default=$3... 264# bbnote overrides specific file NOT present, trying default=$3...
265 if [ -e $3 ]; then 265 if [ -e $3 ]; then
266 oenote $3 present, installing to $4 266 bbnote $3 present, installing to $4
267 install $1 $2 $3 $4 267 install $1 $2 $3 $4
268 else 268 else
269 oenote $3 NOT present, touching empty $4 269 bbnote $3 NOT present, touching empty $4
270 touch $4 270 touch $4
271 fi 271 fi
272} 272}
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index ab7719c469..08be70e72f 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -34,7 +34,7 @@ DISTRO_TYPE = "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)
34 34
35do_configure_prepend() { 35do_configure_prepend() {
36 if [ "x${DISTRO}" != "xfamiliar" -a "${DISTRO_TYPE}" = "debug" ]; then 36 if [ "x${DISTRO}" != "xfamiliar" -a "${DISTRO_TYPE}" = "debug" ]; then
37 oenote "WARNING: applying allow-nopw.patch which allows password-less logins!" 37 bbnote "WARNING: applying allow-nopw.patch which allows password-less logins!"
38 patch -p1 < ${WORKDIR}/allow-nopw.patch 38 patch -p1 < ${WORKDIR}/allow-nopw.patch
39 fi 39 fi
40} 40}
diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb
index c773af0efa..7598c614e5 100644
--- a/meta/recipes-core/eglibc/eglibc_2.12.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.12.bb
@@ -96,7 +96,7 @@ do_compile () {
96 cd ${S}/sunrpc/rpcsvc 96 cd ${S}/sunrpc/rpcsvc
97 for r in ${rpcsvc}; do 97 for r in ${rpcsvc}; do
98 h=`echo $r|sed -e's,\.x$,.h,'` 98 h=`echo $r|sed -e's,\.x$,.h,'`
99 rpcgen -h $r -o $h || oewarn "unable to generate header for $r" 99 rpcgen -h $r -o $h || bbwarn "unable to generate header for $r"
100 done 100 done
101 ) 101 )
102} 102}
diff --git a/meta/recipes-core/glibc/glibc_2.10.1.bb b/meta/recipes-core/glibc/glibc_2.10.1.bb
index 02d485e8ef..33ebe24b03 100644
--- a/meta/recipes-core/glibc/glibc_2.10.1.bb
+++ b/meta/recipes-core/glibc/glibc_2.10.1.bb
@@ -149,7 +149,7 @@ do_compile () {
149 cd ${S}/sunrpc/rpcsvc 149 cd ${S}/sunrpc/rpcsvc
150 for r in ${rpcsvc}; do 150 for r in ${rpcsvc}; do
151 h=`echo $r|sed -e's,\.x$,.h,'` 151 h=`echo $r|sed -e's,\.x$,.h,'`
152 rpcgen -h $r -o $h || oewarn "unable to generate header for $r" 152 rpcgen -h $r -o $h || bbwarn "unable to generate header for $r"
153 done 153 done
154 ) 154 )
155} 155}
diff --git a/meta/recipes-devtools/python/python_2.6.6.bb b/meta/recipes-devtools/python/python_2.6.6.bb
index 3a0a056961..a641ddd617 100644
--- a/meta/recipes-devtools/python/python_2.6.6.bb
+++ b/meta/recipes-devtools/python/python_2.6.6.bb
@@ -31,7 +31,7 @@ TARGET_CC_ARCH_append_armv6 = " -D__SOFTFP__"
31TARGET_CC_ARCH_append_armv7a = " -D__SOFTFP__" 31TARGET_CC_ARCH_append_armv7a = " -D__SOFTFP__"
32 32
33do_configure_prepend() { 33do_configure_prepend() {
34 autoreconf -Wcross --verbose --install --force --exclude=autopoint Modules/_ctypes/libffi || oenote "_ctypes failed to autoreconf" 34 autoreconf -Wcross --verbose --install --force --exclude=autopoint Modules/_ctypes/libffi || bbnote "_ctypes failed to autoreconf"
35} 35}
36 36
37# 37#