diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/kernel-yocto.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index fb8e04e704..7913dd8c00 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass | |||
@@ -196,7 +196,7 @@ do_kernel_checkout() { | |||
196 | # If KMETA is defined, the branch must exist, but a machine branch | 196 | # If KMETA is defined, the branch must exist, but a machine branch |
197 | # can be missing since it may be created later by the tools. | 197 | # can be missing since it may be created later by the tools. |
198 | if [ -n "${KMETA}" ]; then | 198 | if [ -n "${KMETA}" ]; then |
199 | git branch -a | grep -q ${KMETA} | 199 | git branch -a --no-color | grep -q ${KMETA} |
200 | if [ $? -ne 0 ]; then | 200 | if [ $? -ne 0 ]; then |
201 | echo "ERROR. The branch '${KMETA}' is required and was not" | 201 | echo "ERROR. The branch '${KMETA}' is required and was not" |
202 | echo "found. Ensure that the SRC_URI points to a valid linux-yocto" | 202 | echo "found. Ensure that the SRC_URI points to a valid linux-yocto" |
@@ -214,7 +214,7 @@ do_kernel_checkout() { | |||
214 | fi | 214 | fi |
215 | 215 | ||
216 | # convert any remote branches to local tracking ones | 216 | # convert any remote branches to local tracking ones |
217 | for i in `git branch -a | grep remotes | grep -v HEAD`; do | 217 | for i in `git branch -a --no-color | grep remotes | grep -v HEAD`; do |
218 | b=`echo $i | cut -d' ' -f2 | sed 's%remotes/origin/%%'`; | 218 | b=`echo $i | cut -d' ' -f2 | sed 's%remotes/origin/%%'`; |
219 | git show-ref --quiet --verify -- "refs/heads/$b" | 219 | git show-ref --quiet --verify -- "refs/heads/$b" |
220 | if [ $? -ne 0 ]; then | 220 | if [ $? -ne 0 ]; then |