From: Bruce Ashfield <bruce.ashfield@gmail.com>
To: David Vincent <freesilicon@gmail.com>
Cc: Yocto Project Discussion <yocto@yoctoproject.org>
Subject: Re: [yocto-kernel-tools][PATCH 0/1] Rework merge of feature branches
Date: Wed, 25 Jan 2017 13:05:09 -0500 [thread overview]
Message-ID: <CADkTA4N8iMJD1pt=E9qSsjGKAOfvMnHAwS=3h1AntxTxDXOUGQ@mail.gmail.com> (raw)
In-Reply-To: <20170125103759.15880-1-freesilicon@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1743 bytes --]
On Wed, Jan 25, 2017 at 5:37 AM, David Vincent <freesilicon@gmail.com>
wrote:
> I've recently noticed that, on Morty, feature branches of a Yocto kernel
> are not
> merged anymore. This is due to the fact that the meta-series file does not
> process the git merge commands anymore.
>
Indeed. I dropped that functionality on purpose when I did the
simplification
and streamlining of the processing .. since I wanted to see if anyone was
using it.
I now have my answer :D
I need to have a closer look at the patch and run it through some tests
here, but on my glance, you've done it correctly.
> This commit creates a new merge command to be executed when processing the
> kernel metadata. To solve the issue, there is also a patch to send to
> oe-core
> for kernel-yocto.bbclass, but I wait for this patch to be included since
> there
> is no point without it.
>
Send that patch to me, or I'll just do the patch myself .. since yes, we do
need
to add merge to the list of valid comments when processing the meta data.
I'll submit all the changes in my next consolidated pull request for the
kernels + tools.
Bruce
>
> David Vincent (1):
> scc: Move merge command
>
> tools/kgit-meta | 14 ++++++++++++++
> tools/scc | 13 -------------
> tools/scc-cmds/merge.cmd | 10 ++++++++++
> 3 files changed, 24 insertions(+), 13 deletions(-)
> create mode 100644 tools/scc-cmds/merge.cmd
>
> --
> 2.11.0
>
> --
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
>
--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"
[-- Attachment #2: Type: text/html, Size: 2855 bytes --]
next prev parent reply other threads:[~2017-01-25 18:05 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-25 10:37 [yocto-kernel-tools][PATCH 0/1] Rework merge of feature branches David Vincent
2017-01-25 10:37 ` [yocto-kernel-tools][PATCH 1/1] scc: Move merge command David Vincent
2017-01-25 18:05 ` Bruce Ashfield [this message]
2017-01-26 8:38 ` [PATCH] kernel-yocto: Update source tree with kgit-meta David Vincent
2017-01-27 15:09 ` Bruce Ashfield
2017-01-30 4:31 ` [yocto-kernel-tools][PATCH 0/1] Rework merge of feature branches Bruce Ashfield
2017-02-03 8:42 ` David Vincent
2017-02-03 14:18 ` Bruce Ashfield
2017-02-03 18:51 ` Bruce Ashfield
2017-02-07 11:21 ` David Vincent
2017-02-07 14:00 ` Bruce Ashfield
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CADkTA4N8iMJD1pt=E9qSsjGKAOfvMnHAwS=3h1AntxTxDXOUGQ@mail.gmail.com' \
--to=bruce.ashfield@gmail.com \
--cc=freesilicon@gmail.com \
--cc=yocto@yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.