summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Henrique Ferreira de Freitas <joaohf@gmail.com>2014-05-28 23:53:51 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-01 14:29:30 +0100
commit1ef8100d59a91dc68bd1906647518eff8aecebea (patch)
tree98ac1024e405fbaa0d2da796c4ae61d9e6eb5121
parent4562f06975f118bf7779313ba2d7fc8cd7f8e8e2 (diff)
downloadpoky-1ef8100d59a91dc68bd1906647518eff8aecebea.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) Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/combo-layer2
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