diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-08-31 01:18:24 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-01 14:34:28 +0100 |
| commit | 2ddfffe52720d1df70b04131eac553776da7bc73 (patch) | |
| tree | 359db6c8b5374d9ecedde5239bfd850d4efc153e /meta | |
| parent | 362aaebbeb7b241edba00dd8ea08eab07596378c (diff) | |
| download | openembedded-core-2ddfffe52720d1df70b04131eac553776da7bc73.tar.gz openembedded-core-2ddfffe52720d1df70b04131eac553776da7bc73.tar.bz2 openembedded-core-2ddfffe52720d1df70b04131eac553776da7bc73.zip | |
kernel-yocto: replace --is-ancestor with basic git porcelain commands
--is-ancestor is a relatively new git option [commit 5907cda1, Aug 30 2012].
To support build machines with older versions of git installed, we can use
the basic porcelain commands to acheive the same check.
merge-base: "--is-ancestor A B" can be replaced with:
if test "$(git rev-parse --verify A)" = "$(git merge-base A B)"
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/kernel-yocto.bbclass | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index ee09769d46..929d64a290 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -131,8 +131,7 @@ do_patch() { # check to see if the specified SRCREV is reachable from the final branch. # if it wasn't something wrong has happened, and we should error. if [ "${machine_srcrev}" != "AUTOINC" ]; then - git merge-base --is-ancestor ${machine_srcrev} HEAD - if [ $? -ne 0 ]; then + if ! [ "$(git rev-parse --verify ${machine_srcrev})" = "$(git merge-base ${machine_srcrev} HEAD)" ]; then bberror "SRCREV ${machine_srcrev} was specified, but is not reachable" bbfatal "Check the BSP description for incorrect branch selection, or other errors." fi |