kernel-yocto: improve metadata patching

The ability to patch the kernel-yocto metadata was added to support
debug and easier test cycles on kernel-cache provided fragments. As
such, it was very simple and has limited functionality.

That being said, it is an available feature and can be improved to
handle patches that fail to apply.

The main kernel patching is already handled by the kern-tools, so
we extend the patching of the meta-data to same tools and inherit
more functinality from the scripts.

[YOCTO #15266]

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes-recipe/kernel-yocto.bbclass b/meta/classes-recipe/kernel-yocto.bbclass
index cb9cd26b09e3f0dfa3dd66d5f0630aa434613e82..9a86616dad4066bfdae851c4d8107b6549db7513 100644 (file)
--- a/meta/classes-recipe/kernel-yocto.bbclass
+++ b/meta/classes-recipe/kernel-yocto.bbclass
@@ -176,12 +176,32 @@ do_kernel_metadata() {
                # kernel source tree, where they'll be used later.
                check_git_config
                patches="${@" ".join(find_patches(d,'kernel-meta'))}"
-               for p in $patches; do
+               if [ -n "$patches" ]; then
                    (
-                       cd ${WORKDIR}/kernel-meta
-                       git am -s $p
-                   )
-               done
+                           cd ${WORKDIR}/kernel-meta
+
+                           # take the SRC_URI patches, and create a series file
+                           # this is required to support some better processing
+                           # of issues with the patches
+                           rm -f series
+                           for p in $patches; do
+                               cp $p .
+                               echo "$(basename $p)" >> series
+                           done
+
+                           # process the series with kgit-s2q, which is what is
+                           # handling the rest of the kernel. This allows us
+                           # more flexibility for handling failures or advanced
+                           # mergeing functinoality
+                           message=$(kgit-s2q --gen -v --patches ${WORKDIR}/kernel-meta 2>&1)
+                           if [ $? -ne 0 ]; then
+                               # setup to try the patch again
+                               kgit-s2q --prev
+                               bberror "Problem applying patches to: ${WORKDIR}/kernel-meta"
+                               bbfatal_log "\n($message)"
+                           fi
+                       )
+               fi
        fi
 
        sccs_from_src_uri="${@" ".join(find_sccs(d))}"