diff options
Diffstat (limited to 'meta/classes')
| -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() { | |||
| 131 | # check to see if the specified SRCREV is reachable from the final branch. | 131 | # check to see if the specified SRCREV is reachable from the final branch. |
| 132 | # if it wasn't something wrong has happened, and we should error. | 132 | # if it wasn't something wrong has happened, and we should error. |
| 133 | if [ "${machine_srcrev}" != "AUTOINC" ]; then | 133 | if [ "${machine_srcrev}" != "AUTOINC" ]; then |
| 134 | git merge-base --is-ancestor ${machine_srcrev} HEAD | 134 | if ! [ "$(git rev-parse --verify ${machine_srcrev})" = "$(git merge-base ${machine_srcrev} HEAD)" ]; then |
| 135 | if [ $? -ne 0 ]; then | ||
| 136 | bberror "SRCREV ${machine_srcrev} was specified, but is not reachable" | 135 | bberror "SRCREV ${machine_srcrev} was specified, but is not reachable" |
| 137 | bbfatal "Check the BSP description for incorrect branch selection, or other errors." | 136 | bbfatal "Check the BSP description for incorrect branch selection, or other errors." |
| 138 | fi | 137 | fi |