From: David Vincent <freesilicon@gmail.com>
To: yocto@yoctoproject.org
Subject: [yocto-kernel-tools][PATCH 0/1] Rework merge of feature branches
Date: Wed, 25 Jan 2017 11:37:58 +0100 [thread overview]
Message-ID: <20170125103759.15880-1-freesilicon@gmail.com> (raw)
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.
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.
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
next reply other threads:[~2017-01-25 10:39 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-25 10:37 David Vincent [this message]
2017-01-25 10:37 ` [yocto-kernel-tools][PATCH 1/1] scc: Move merge command David Vincent
2017-01-25 18:05 ` [yocto-kernel-tools][PATCH 0/1] Rework merge of feature branches Bruce Ashfield
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=20170125103759.15880-1-freesilicon@gmail.com \
--to=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.