1 files changed, 7 insertions, 0 deletions

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 7c32c96646..a60327a07e 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -61,6 +61,7 @@ def get_machine_branch(d, default):
     return default
 
 do_kernel_metadata() {
+        set +e
         cd ${S}
         export KMETA=${KMETA}
 
@@ -148,12 +149,18 @@ do_kernel_metadata() {
         elements="`echo -n ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}`"
         if [ -n "${elements}" ]; then
                 scc --force -o ${S}/${meta_dir}:cfg,meta ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
+                if [ $? -ne 0 ]; then
+                        bbfatal_log "Could not generate configuration queue for ${KMACHINE}."
+                fi
         fi
 
         # run2: only generate patches for elements that have been passed on the SRC_URI
         elements="`echo -n ${sccs} ${patches} ${KERNEL_FEATURES}`"
         if [ -n "${elements}" ]; then
                 scc --force -o ${S}/${meta_dir}:patch --cmds patch ${includes} ${sccs} ${patches} ${KERNEL_FEATURES}
+                if [ $? -ne 0 ]; then
+                        bbfatal_log "Could not generate configuration queue for ${KMACHINE}."
+                fi
         fi
 }