Patchwork [1/2] kernel-yocto: Fix case where recipe is always reparsed

login
register
mail settings
Submitter Richard Purdie
Date July 5, 2011, 3:45 p.m.
Message ID <1309880759.20015.724.camel@rex>
Download mbox | patch
Permalink /patch/6987/
State New, archived
Headers show

Comments

Richard Purdie - July 5, 2011, 3:45 p.m.
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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes/kernel-yocto.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Bruce Ashfield - July 7, 2011, 2:23 a.m.
On Tue, Jul 5, 2011 at 12:45 PM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> 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.


Indeed! I had no idea. But this makes sense to me. I haven't checked
to see if this is already in the tree, but I can add my Acked-by to this.

Cheers,

Bruce

>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  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 536434f..98272fc 100644
> --- a/meta/classes/kernel-yocto.bbclass
> +++ b/meta/classes/kernel-yocto.bbclass
> @@ -136,7 +136,7 @@ do_validate_branches() {
>                return
>        fi
>
> -       # nothing to do if SRCREV=${AUTOREV}
> +       # nothing to do if SRCREV is AUTOREV
>        if [ "${SRCREV_machine}" = "AUTOINC" ]; then
>                # restore the branch for builds
>                git checkout -f ${KBRANCH}
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Patch

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 536434f..98272fc 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -136,7 +136,7 @@  do_validate_branches() {
  	 	return
  	fi
 
-	# nothing to do if SRCREV=${AUTOREV}
+	# nothing to do if SRCREV is AUTOREV
 	if [ "${SRCREV_machine}" = "AUTOINC" ]; then
 		# restore the branch for builds
 		git checkout -f ${KBRANCH}