1 files changed, 8 insertions, 2 deletions

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 8650e55de7..9b8bab63ca 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -139,10 +139,16 @@ do_kernel_metadata() {
         meta_dir=$(kgit --meta)
 
         # run1: pull all the configuration fragments, no matter where they come from
-        scc --force -o ${S}/${meta_dir}:cfg,meta ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
+        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}
+        fi
 
         # run2: only generate patches for elements that have been passed on the SRC_URI
-        scc --force -o ${S}/${meta_dir}:patch --cmds patch ${includes} ${sccs} ${patches} ${KERNEL_FEATURES}
+        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}
+        fi
 }
 
 do_patch() {