summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-08-31 01:18:24 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-01 14:35:41 +0100
commit92c1ece6c347030d48995a36f4c67861356e59d3 (patch)
tree85f205d15262cd891e789849fd52de65acd4b65e
parent61c15c03b410f645a07a1095e1a5726324d69dd1 (diff)
downloadpoky-92c1ece6c347030d48995a36f4c67861356e59d3.tar.gz
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)" (From OE-Core rev: 2ddfffe52720d1df70b04131eac553776da7bc73) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel-yocto.bbclass3
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