[PATCH 0/1] Add a missing '[' to kernel-yocto.bbclass

[PATCH 0/1] Add a missing '[' to kernel-yocto.bbclass

[Peter Kjellerstedt]

This adds a missing '[' which caused the test for
${SRCREV_machine} == "INVALID" to not work as expected.

//Peter

The following changes since commit 102bf5e0f640fe85068452a42b85077f1c81e0c9:

  build-appliance: Update SRCREV for release (2013-10-08 16:33:43 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib pkj/kernel-yocto_typo
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=pkj/kernel-yocto_typo

Peter Kjellerstedt (1):
  kernel-yocto: Add a missing '['

 meta/classes/kernel-yocto.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
1.8.4

[PATCH 1/1] kernel-yocto: Add a missing '['

[Peter Kjellerstedt]

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
 meta/classes/kernel-yocto.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 97a5fa7..8f79932 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -298,7 +298,7 @@ do_validate_branches() {
 	set +e
 	# if SRCREV is AUTOREV it shows up as AUTOINC there's nothing to
 	# check and we can exit early
-	if [ "${SRCREV_machine}" = "AUTOINC" ] || "${SRCREV_machine}" = "INVALID" ] ||
+	if [ "${SRCREV_machine}" = "AUTOINC" ] || [ "${SRCREV_machine}" = "INVALID" ] ||
 	   [ "${SRCREV_machine}" = "" ]; then
 		return
 	fi
-- 
1.8.4

Re: [PATCH 1/1] kernel-yocto: Add a missing '['

[Bruce Ashfield]

On Thu, Oct 10, 2013 at 4:52 AM, Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>

Ouch. And the worst part is that I've since changed this line in some pre 1.6
work and didn't notice the fat finger slip.

I'd merge this myself, but I'm out of the office, so I'll ack it here,
and RP/Saul
can hopefully pick it up directly.

Bruce

> ---
>  meta/classes/kernel-yocto.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
> index 97a5fa7..8f79932 100644
> --- a/meta/classes/kernel-yocto.bbclass
> +++ b/meta/classes/kernel-yocto.bbclass
> @@ -298,7 +298,7 @@ do_validate_branches() {
>         set +e
>         # if SRCREV is AUTOREV it shows up as AUTOINC there's nothing to
>         # check and we can exit early
> -       if [ "${SRCREV_machine}" = "AUTOINC" ] || "${SRCREV_machine}" = "INVALID" ] ||
> +       if [ "${SRCREV_machine}" = "AUTOINC" ] || [ "${SRCREV_machine}" = "INVALID" ] ||
>            [ "${SRCREV_machine}" = "" ]; then
>                 return
>         fi
> --
> 1.8.4
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"