summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2016-08-30 12:49:05 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-05 11:56:01 +0100
commit5ea48fa5ee1201e17bac7e9cf6d48c3795216911 (patch)
tree639aa331fe820e8bed613ae775d08425e745d53f /meta/classes
parent942e2afac2475b65b405a6a9ab8c5bbcb6d5ecee (diff)
downloadpoky-5ea48fa5ee1201e17bac7e9cf6d48c3795216911.tar.gz
kernel-yocto: test for empty artifacts
With the updated kernel tools, we generate a list of sccs, patches, configs and BSP definitions as part of the meta data generation. It is valid if there aren't any of these artifacts found (i.e. you are just building a branch and a default config), but invoking the tools with no inputs isn't a good idea. To avoid this issue, we generate a string based on the artifacts and skip calling the tools if there's nothing to do. (From OE-Core rev: 58715183493de1deb90f2ab075048462b4bf6c73) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/kernel-yocto.bbclass10
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() {
139 meta_dir=$(kgit --meta) 139 meta_dir=$(kgit --meta)
140 140
141 # run1: pull all the configuration fragments, no matter where they come from 141 # run1: pull all the configuration fragments, no matter where they come from
142 scc --force -o ${S}/${meta_dir}:cfg,meta ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES} 142 elements="`echo -n ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}`"
143 if [ -n "${elements}" ]; then
144 scc --force -o ${S}/${meta_dir}:cfg,meta ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
145 fi
143 146
144 # run2: only generate patches for elements that have been passed on the SRC_URI 147 # run2: only generate patches for elements that have been passed on the SRC_URI
145 scc --force -o ${S}/${meta_dir}:patch --cmds patch ${includes} ${sccs} ${patches} ${KERNEL_FEATURES} 148 elements="`echo -n ${sccs} ${patches} ${KERNEL_FEATURES}`"
149 if [ -n "${elements}" ]; then
150 scc --force -o ${S}/${meta_dir}:patch --cmds patch ${includes} ${sccs} ${patches} ${KERNEL_FEATURES}
151 fi
146} 152}
147 153
148do_patch() { 154do_patch() {