summaryrefslogtreecommitdiffstats
path: root/meta/classes/kernel-yocto.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/kernel-yocto.bbclass')
-rw-r--r--meta/classes/kernel-yocto.bbclass16
1 files changed, 8 insertions, 8 deletions
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() {
120 120
121 createme -v -v ${createme_flags} ${ARCH} ${machine_branch} 121 createme -v -v ${createme_flags} ${ARCH} ${machine_branch}
122 if [ $? -ne 0 ]; then 122 if [ $? -ne 0 ]; then
123 bbfatal "Could not create ${machine_branch}" 123 bbfatal_log "Could not create ${machine_branch}"
124 fi 124 fi
125 125
126 sccs="$sccs ${@" ".join(find_sccs(d))}" 126 sccs="$sccs ${@" ".join(find_sccs(d))}"
@@ -152,7 +152,7 @@ do_kernel_metadata() {
152 updateme ${updateme_flags} -DKDESC=${KMACHINE}:${LINUX_KERNEL_TYPE} \ 152 updateme ${updateme_flags} -DKDESC=${KMACHINE}:${LINUX_KERNEL_TYPE} \
153 ${includes} ${addon_features} ${ARCH} ${KMACHINE} ${sccs} ${patches} 153 ${includes} ${addon_features} ${ARCH} ${KMACHINE} ${sccs} ${patches}
154 if [ $? -ne 0 ]; then 154 if [ $? -ne 0 ]; then
155 bbfatal "Could not update ${machine_branch}" 155 bbfatal_log "Could not update ${machine_branch}"
156 fi 156 fi
157} 157}
158 158
@@ -163,7 +163,7 @@ do_patch() {
163 patchme ${KMACHINE} 163 patchme ${KMACHINE}
164 if [ $? -ne 0 ]; then 164 if [ $? -ne 0 ]; then
165 bberror "Could not apply patches for ${KMACHINE}." 165 bberror "Could not apply patches for ${KMACHINE}."
166 bbfatal "Patch failures can be resolved in the linux source directory ${S})" 166 bbfatal_log "Patch failures can be resolved in the linux source directory ${S})"
167 fi 167 fi
168 168
169 # check to see if the specified SRCREV is reachable from the final branch. 169 # check to see if the specified SRCREV is reachable from the final branch.
@@ -253,7 +253,7 @@ do_kernel_checkout() {
253 if [ $? -eq 1 ]; then 253 if [ $? -eq 1 ]; then
254 bberror "The branch '${KMETA}' is required and was not found" 254 bberror "The branch '${KMETA}' is required and was not found"
255 bberror "Ensure that the SRC_URI points to a valid linux-yocto" 255 bberror "Ensure that the SRC_URI points to a valid linux-yocto"
256 bbfatal "kernel repository" 256 bbfatal_log "kernel repository"
257 fi 257 fi
258 fi 258 fi
259 259
@@ -293,7 +293,7 @@ do_kernel_configme() {
293 PATH=${PATH}:${S}/scripts/util 293 PATH=${PATH}:${S}/scripts/util
294 configme ${configmeflags} --reconfig --output ${B} ${LINUX_KERNEL_TYPE} ${KMACHINE} 294 configme ${configmeflags} --reconfig --output ${B} ${LINUX_KERNEL_TYPE} ${KMACHINE}
295 if [ $? -ne 0 ]; then 295 if [ $? -ne 0 ]; then
296 bbfatal "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" 296 bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
297 fi 297 fi
298 298
299 echo "# Global settings from linux recipe" >> ${B}/.config 299 echo "# Global settings from linux recipe" >> ${B}/.config
@@ -372,7 +372,7 @@ do_validate_branches() {
372 git cat-file -t ${machine_srcrev} > /dev/null 372 git cat-file -t ${machine_srcrev} > /dev/null
373 if [ $? -ne 0 ]; then 373 if [ $? -ne 0 ]; then
374 bberror "${machine_srcrev} is not a valid commit ID." 374 bberror "${machine_srcrev} is not a valid commit ID."
375 bbfatal "The kernel source tree may be out of sync" 375 bbfatal_log "The kernel source tree may be out of sync"
376 fi 376 fi
377 force_srcrev=${machine_srcrev} 377 force_srcrev=${machine_srcrev}
378 fi 378 fi
@@ -387,14 +387,14 @@ do_validate_branches() {
387 git cat-file -t ${target_meta_head} > /dev/null 387 git cat-file -t ${target_meta_head} > /dev/null
388 if [ $? -ne 0 ]; then 388 if [ $? -ne 0 ]; then
389 bberror "${target_meta_head} is not a valid commit ID" 389 bberror "${target_meta_head} is not a valid commit ID"
390 bbfatal "The kernel source tree may be out of sync" 390 bbfatal_log "The kernel source tree may be out of sync"
391 fi 391 fi
392 if [ "$meta_head" != "$target_meta_head" ]; then 392 if [ "$meta_head" != "$target_meta_head" ]; then
393 bbnote "Setting branch ${KMETA} to ${target_meta_head}" 393 bbnote "Setting branch ${KMETA} to ${target_meta_head}"
394 git branch -m ${KMETA} ${KMETA}-orig 394 git branch -m ${KMETA} ${KMETA}-orig
395 git checkout -q -b ${KMETA} ${target_meta_head} 395 git checkout -q -b ${KMETA} ${target_meta_head}
396 if [ $? -ne 0 ];then 396 if [ $? -ne 0 ];then
397 bbfatal "Could not checkout ${KMETA} branch from known hash ${target_meta_head}" 397 bbfatal_log "Could not checkout ${KMETA} branch from known hash ${target_meta_head}"
398 fi 398 fi
399 fi 399 fi
400 fi 400 fi