diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-09-23 03:55:44 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-24 11:48:16 +0100 |
| commit | 5126ac0aeb3154d31769dc20a46b6b1a6b2e3d9b (patch) | |
| tree | 8e1194f35879d7fd6037047b22b9c7c492edb74b /meta | |
| parent | b0f81f460cf96798d79d72da7a3246c321caf654 (diff) | |
| download | openembedded-core-5126ac0aeb3154d31769dc20a46b6b1a6b2e3d9b.tar.gz openembedded-core-5126ac0aeb3154d31769dc20a46b6b1a6b2e3d9b.tar.bz2 openembedded-core-5126ac0aeb3154d31769dc20a46b6b1a6b2e3d9b.zip | |
kern-tools: fix multi patch application without headers
Updating the kern-tools SRCREV to import the following change:
kgit-s2q: always update ORIG_HEAD after applying changes
In situations where git am fails to apply patches, and git apply is used,
we must update ORIG_HEAD as well as HEAD. This is required, since if the
next patch in the queue also fails git am application, it will reset to
ORIG_HEAD before using git apply. If we haven't updated ORIG_HEAD, we'll
end up warping back to the top of the branch each time.
This problem can only be seen in very specific situations, in particular if
a generated BSP branches from qemuppc, and has a series of non git "am able"
patches. We fail, since all of the qemuppc patches are not applied due to
the branch head constantly being reset.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 6cfb624cc3..8c68ff3ac8 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70c DEPENDS = "git-native" -SRCREV = "9bbdd79086c164c82e4f982cbc3eb0b697ba651d" +SRCREV = "a42509b01ccfe5020a226b23d3a52c07b3fb2051" PR = "r12" PV = "0.2+git${SRCPV}" |