diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-05 16:35:03 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-07 10:57:51 +0100 |
commit | 0e236d004700fbb9d8286bb3ee4d21dff3c6870b (patch) | |
tree | 8b5dd74d2753a7512953778bf573b303fba824c6 /meta | |
parent | b5f288ab23925e830df5473855b1868e15ff9487 (diff) | |
download | poky-0e236d004700fbb9d8286bb3ee4d21dff3c6870b.tar.gz |
kernel-yocto: Fix case where recipe is always reparsed
If you include a bitbake variable as a comment in a shell function
then it gets expanded by the bitbake signature handling code.
This could be classed as a bug or a feature depending on your viewpoint
(e.g. a multiline variable included in a comment could actually contain
executable code).
Since we don't always want kernel-yocto to reparse this changes the
syntax of the comment so it doesn't trigger the problem.
(From OE-Core rev: 512be74ee0d7ad7e76c1be62d1e0f499aa51d174)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/kernel-yocto.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 536434fdf1..98272fcc3b 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass | |||
@@ -136,7 +136,7 @@ do_validate_branches() { | |||
136 | return | 136 | return |
137 | fi | 137 | fi |
138 | 138 | ||
139 | # nothing to do if SRCREV=${AUTOREV} | 139 | # nothing to do if SRCREV is AUTOREV |
140 | if [ "${SRCREV_machine}" = "AUTOINC" ]; then | 140 | if [ "${SRCREV_machine}" = "AUTOINC" ]; then |
141 | # restore the branch for builds | 141 | # restore the branch for builds |
142 | git checkout -f ${KBRANCH} | 142 | git checkout -f ${KBRANCH} |