diff options
author | João Henrique Ferreira de Freitas <joaohf@gmail.com> | 2014-05-28 23:53:51 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-10 17:12:18 +0100 |
commit | 303d17ac3c3db40f4db9647317f130f807372629 (patch) | |
tree | 58f33650084c277da04a0d044b38c789d62db4f2 /scripts | |
parent | 28938930ba5c45755e1f7419522c9a4f7e191520 (diff) | |
download | poky-303d17ac3c3db40f4db9647317f130f807372629.tar.gz |
combo-layer: fix revlist taking into account file_filter
If file_filter is set, git format-patch takes account but git rev-list
does not. So revlist is going to get with wrong revisions. And last_revision
will be updated with wrong revision. The next time that user run
combo-layer it complain about applying patches.
So ensure that 'git rev-list' are using file_filter as 'git format-patch'.
(From OE-Core rev: c22e40900d8e33c2c884e714c11ddb771b86923f)
(From OE-Core rev: 7ad5b4dece1d8fba6f1b6b530830384e6c8fb74f)
Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/combo-layer | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer index 9da1d3a89e..19d64e64e1 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer | |||
@@ -395,7 +395,7 @@ def action_update(conf, args): | |||
395 | logger.debug("generated patch set:\n%s" % output) | 395 | logger.debug("generated patch set:\n%s" % output) |
396 | patchlist = output.splitlines() | 396 | patchlist = output.splitlines() |
397 | 397 | ||
398 | rev_cmd = 'git rev-list --no-merges ' + rev_cmd_range | 398 | rev_cmd = "git rev-list --no-merges %s -- %s" % (rev_cmd_range, file_filter) |
399 | revlist = runcmd(rev_cmd, ldir).splitlines() | 399 | revlist = runcmd(rev_cmd, ldir).splitlines() |
400 | 400 | ||
401 | # Step 3: Call repo specific hook to adjust patch | 401 | # Step 3: Call repo specific hook to adjust patch |