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

[Bruce Ashfield <bruce.ashfield@windriver.com>]

On 2017-01-26 03:38 AM, David Vincent wrote:
> 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.

I have this queued, with some modifications. I as traveling this week,
so it'll be early next week before this goes out for merge.

cheers,

Bruce

>
> Signed-off-by: David Vincent <freesilicon@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() {
>