[yocto] [PATCH] kernel-yocto: Update source tree with kgit-meta

[David Vincent]

kgit-meta processes a file called meta-series to update the source tree
(create, merge branches, ...). This fixes the merging of feature
branches using the new merge command of yocto-kernel-tools.

Signed-off-by: David Vincent <freesilicon at gmail.com>
---
 meta/classes/kernel-yocto.bbclass | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 5cfd8aff50..b37ac01a84 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -162,6 +162,19 @@ do_kernel_metadata() {
 			bbfatal_log "Could not generate configuration queue for ${KMACHINE}."
 		fi
 	fi
+
+	# Update git repository by running kgit-meta
+	cd ${S}
+
+	check_git_config
+	meta_dir=$(kgit --meta)
+	if [ -f "${meta_dir}/meta-series" ]; then
+		kgit-meta ${meta_dir}/meta-series
+		if [ $? -ne 0 ]; then
+			bberror "Could not apply metadata for ${KMACHINE}."
+			bbfatal_log "Failures can be resolved in the linux source directory ${S})"
+		fi
+	fi
 }
 
 do_patch() {
-- 
2.11.0