summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/kernel-yocto.bbclass7
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):
61 return default 61 return default
62 62
63do_kernel_metadata() { 63do_kernel_metadata() {
64 set +e
64 cd ${S} 65 cd ${S}
65 export KMETA=${KMETA} 66 export KMETA=${KMETA}
66 67
@@ -148,12 +149,18 @@ do_kernel_metadata() {
148 elements="`echo -n ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}`" 149 elements="`echo -n ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}`"
149 if [ -n "${elements}" ]; then 150 if [ -n "${elements}" ]; then
150 scc --force -o ${S}/${meta_dir}:cfg,meta ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES} 151 scc --force -o ${S}/${meta_dir}:cfg,meta ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
152 if [ $? -ne 0 ]; then
153 bbfatal_log "Could not generate configuration queue for ${KMACHINE}."
154 fi
151 fi 155 fi
152 156
153 # run2: only generate patches for elements that have been passed on the SRC_URI 157 # run2: only generate patches for elements that have been passed on the SRC_URI
154 elements="`echo -n ${sccs} ${patches} ${KERNEL_FEATURES}`" 158 elements="`echo -n ${sccs} ${patches} ${KERNEL_FEATURES}`"
155 if [ -n "${elements}" ]; then 159 if [ -n "${elements}" ]; then
156 scc --force -o ${S}/${meta_dir}:patch --cmds patch ${includes} ${sccs} ${patches} ${KERNEL_FEATURES} 160 scc --force -o ${S}/${meta_dir}:patch --cmds patch ${includes} ${sccs} ${patches} ${KERNEL_FEATURES}
161 if [ $? -ne 0 ]; then
162 bbfatal_log "Could not generate configuration queue for ${KMACHINE}."
163 fi
157 fi 164 fi
158} 165}
159 166