diff options
| -rw-r--r-- | meta/classes/autotools.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/kernel-yocto.bbclass | 16 | ||||
| -rw-r--r-- | meta/classes/scons.bbclass | 4 | ||||
| -rw-r--r-- | meta/recipes-extended/groff/groff_1.22.3.bb | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 454dcb669f..6f514294c4 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -87,7 +87,7 @@ oe_runconf () { if [ "$?" != "0" ]; then echo "Configure failed. The contents of all config.log files follows to aid debugging" find ${S} -ignore_readdir_race -name config.log -print -exec cat {} \; - bbfatal "oe_runconf failed" + die "oe_runconf failed" fi set -e else @@ -287,7 +287,7 @@ autotools_do_configure() { intltoolize --copy --force --automake fi bbnote Executing ACLOCAL=\"$ACLOCAL\" autoreconf --verbose --install --force ${EXTRA_AUTORECONF} $acpaths - ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || bbfatal "autoreconf execution failed." + ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || die "autoreconf execution failed." cd $olddir fi if [ -e ${S}/configure ]; then diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index fb14926fad..2f9a41f34d 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -120,7 +120,7 @@ do_kernel_metadata() { createme -v -v ${createme_flags} ${ARCH} ${machine_branch} if [ $? -ne 0 ]; then - bbfatal "Could not create ${machine_branch}" + bbfatal_log "Could not create ${machine_branch}" fi sccs="$sccs ${@" ".join(find_sccs(d))}" @@ -152,7 +152,7 @@ do_kernel_metadata() { updateme ${updateme_flags} -DKDESC=${KMACHINE}:${LINUX_KERNEL_TYPE} \ ${includes} ${addon_features} ${ARCH} ${KMACHINE} ${sccs} ${patches} if [ $? -ne 0 ]; then - bbfatal "Could not update ${machine_branch}" + bbfatal_log "Could not update ${machine_branch}" fi } @@ -163,7 +163,7 @@ do_patch() { patchme ${KMACHINE} if [ $? -ne 0 ]; then bberror "Could not apply patches for ${KMACHINE}." - bbfatal "Patch failures can be resolved in the linux source directory ${S})" + bbfatal_log "Patch failures can be resolved in the linux source directory ${S})" fi # check to see if the specified SRCREV is reachable from the final branch. @@ -253,7 +253,7 @@ do_kernel_checkout() { if [ $? -eq 1 ]; then bberror "The branch '${KMETA}' is required and was not found" bberror "Ensure that the SRC_URI points to a valid linux-yocto" - bbfatal "kernel repository" + bbfatal_log "kernel repository" fi fi @@ -293,7 +293,7 @@ do_kernel_configme() { PATH=${PATH}:${S}/scripts/util configme ${configmeflags} --reconfig --output ${B} ${LINUX_KERNEL_TYPE} ${KMACHINE} if [ $? -ne 0 ]; then - bbfatal "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" + bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" fi echo "# Global settings from linux recipe" >> ${B}/.config @@ -372,7 +372,7 @@ do_validate_branches() { git cat-file -t ${machine_srcrev} > /dev/null if [ $? -ne 0 ]; then bberror "${machine_srcrev} is not a valid commit ID." - bbfatal "The kernel source tree may be out of sync" + bbfatal_log "The kernel source tree may be out of sync" fi force_srcrev=${machine_srcrev} fi @@ -387,14 +387,14 @@ do_validate_branches() { git cat-file -t ${target_meta_head} > /dev/null if [ $? -ne 0 ]; then bberror "${target_meta_head} is not a valid commit ID" - bbfatal "The kernel source tree may be out of sync" + bbfatal_log "The kernel source tree may be out of sync" fi if [ "$meta_head" != "$target_meta_head" ]; then bbnote "Setting branch ${KMETA} to ${target_meta_head}" git branch -m ${KMETA} ${KMETA}-orig git checkout -q -b ${KMETA} ${target_meta_head} if [ $? -ne 0 ];then - bbfatal "Could not checkout ${KMETA} branch from known hash ${target_meta_head}" + bbfatal_log "Could not checkout ${KMETA} branch from known hash ${target_meta_head}" fi fi fi diff --git a/meta/classes/scons.bbclass b/meta/classes/scons.bbclass index fc0f26b17b..b8de822ff7 100644 --- a/meta/classes/scons.bbclass +++ b/meta/classes/scons.bbclass @@ -4,12 +4,12 @@ EXTRA_OESCONS ?= "" scons_do_compile() { ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} || \ - bbfatal "scons build execution failed." + die "scons build execution failed." } scons_do_install() { ${STAGING_BINDIR_NATIVE}/scons PREFIX=${D}${prefix} prefix=${D}${prefix} install ${EXTRA_OESCONS}|| \ - bbfatal "scons install execution failed." + die "scons install execution failed." } EXPORT_FUNCTIONS do_compile do_install diff --git a/meta/recipes-extended/groff/groff_1.22.3.bb b/meta/recipes-extended/groff/groff_1.22.3.bb index e8cf5242a5..4bffa814ff 100644 --- a/meta/recipes-extended/groff/groff_1.22.3.bb +++ b/meta/recipes-extended/groff/groff_1.22.3.bb @@ -41,7 +41,7 @@ do_configure_append() { # generate gnulib configure script olddir=`pwd` cd ${S}/src/libs/gnulib/ - ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || bbfatal "autoreconf execution failed." + ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || die "autoreconf execution failed." cd ${olddir} } |