[OE-core] [PATCH] classes/kernel-yocto: Apply patches from BSP
Joshua Watt
jpewhacker at gmail.com
Thu Dec 19 18:37:59 UTC 2019
0f698dfd1c8 ("kernel-yocto: streamline patch, configuration and audit
phases") appears to have inadvertently broken support for BSP .scc files
to provide patches for the kernel. Restore this behavior by adding
$bsp_definition to the list of files processed for patches.
Additionally, the logic can be simplified now that the same elements are
used for both configuration fragments and patches
Signed-off-by: Joshua Watt <JPEWhacker at gmail.com>
---
meta/classes/kernel-yocto.bbclass | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index ed9bcfa57c..08c02a8f50 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -193,12 +193,9 @@ do_kernel_metadata() {
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}
+ # run2: generate patches
+ scc --force -o ${S}/${meta_dir}:patch --cmds patch ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
if [ $? -ne 0 ]; then
bbfatal_log "Could not generate configuration queue for ${KMACHINE}."
fi
--
2.23.0
More information about the Openembedded-core
mailing list