[PATCH] linux-ti-staging: fix missing kernel image in /boot

[PATCH] linux-ti-staging: fix missing kernel image in /boot

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

We rely on kernel-base having run-time dependency on kernel-image, which
normally would pull uImage/zImage into /boot directory of rootfs.
Thanks to Chase for pointing me in the right direction by noticing that our
addition of cm3 firmware breaks that dependency for ti33x.
The reason for that is RDEPENDS is being conditionally assigned with ?=
in kernel.bbclass and using += with that is unsafe/racy and _append should
be used instead.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 recipes-kernel/linux/linux-ti-staging_3.8.bb | 2 +-
 recipes-kernel/linux/linux-ti-staging_git.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/linux/linux-ti-staging_3.8.bb b/recipes-kernel/linux/linux-ti-staging_3.8.bb
index fd7b671..833fb48 100644
--- a/recipes-kernel/linux/linux-ti-staging_3.8.bb
+++ b/recipes-kernel/linux/linux-ti-staging_3.8.bb
@@ -11,7 +11,7 @@ require recipes-kernel/linux/setup-defconfig.inc
 
 # Add a run-time dependency for the PM firmware to be installed
 # on the target file system.
-RDEPENDS_kernel-base_ti33x += "am33x-cm3 am33x-cm3-initscript"
+RDEPENDS_kernel-base_append_ti33x = " am33x-cm3 am33x-cm3-initscript"
 
 # Default is to package all dtb files for ti33x devices unless building
 # for the specific beaglebone machine.
diff --git a/recipes-kernel/linux/linux-ti-staging_git.bb b/recipes-kernel/linux/linux-ti-staging_git.bb
index e903215..778ea7f 100644
--- a/recipes-kernel/linux/linux-ti-staging_git.bb
+++ b/recipes-kernel/linux/linux-ti-staging_git.bb
@@ -10,7 +10,7 @@ require recipes-kernel/linux/setup-defconfig.inc
 
 # Add a run-time dependency for the PM firmware to be installed
 # on the target file system.
-RDEPENDS_kernel-base_ti33x += "am33x-cm3 am33x-cm3-initscript"
+RDEPENDS_kernel-base_append_ti33x = " am33x-cm3 am33x-cm3-initscript"
 
 # Default is to package all dtb files for ti33x devices unless building
 # for the specific beaglebone machine.
-- 
1.8.3.2

Re: [PATCH] linux-ti-staging: fix missing kernel image in /boot

[Maupin, Chase]

Acked-by: Chase Maupin <chase.maupin@ti.com>



>-----Original Message-----
>From: meta-ti-bounces@yoctoproject.org [mailto:meta-ti-
>bounces@yoctoproject.org] On Behalf Of Denys Dmytriyenko
>Sent: Wednesday, September 25, 2013 1:58 PM
>To: meta-ti@yoctoproject.org
>Subject: [meta-ti] [PATCH] linux-ti-staging: fix missing kernel
>image in /boot
>
>From: Denys Dmytriyenko <denys@ti.com>
>
>We rely on kernel-base having run-time dependency on kernel-image,
>which
>normally would pull uImage/zImage into /boot directory of rootfs.
>Thanks to Chase for pointing me in the right direction by noticing
>that our
>addition of cm3 firmware breaks that dependency for ti33x.
>The reason for that is RDEPENDS is being conditionally assigned
>with ?=
>in kernel.bbclass and using += with that is unsafe/racy and
>_append should
>be used instead.
>
>Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>---
> recipes-kernel/linux/linux-ti-staging_3.8.bb | 2 +-
> recipes-kernel/linux/linux-ti-staging_git.bb | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/recipes-kernel/linux/linux-ti-staging_3.8.bb
>b/recipes-kernel/linux/linux-ti-staging_3.8.bb
>index fd7b671..833fb48 100644
>--- a/recipes-kernel/linux/linux-ti-staging_3.8.bb
>+++ b/recipes-kernel/linux/linux-ti-staging_3.8.bb
>@@ -11,7 +11,7 @@ require recipes-kernel/linux/setup-defconfig.inc
>
> # Add a run-time dependency for the PM firmware to be installed
> # on the target file system.
>-RDEPENDS_kernel-base_ti33x += "am33x-cm3 am33x-cm3-initscript"
>+RDEPENDS_kernel-base_append_ti33x = " am33x-cm3 am33x-cm3-
>initscript"
>
> # Default is to package all dtb files for ti33x devices unless
>building
> # for the specific beaglebone machine.
>diff --git a/recipes-kernel/linux/linux-ti-staging_git.bb
>b/recipes-kernel/linux/linux-ti-staging_git.bb
>index e903215..778ea7f 100644
>--- a/recipes-kernel/linux/linux-ti-staging_git.bb
>+++ b/recipes-kernel/linux/linux-ti-staging_git.bb
>@@ -10,7 +10,7 @@ require recipes-kernel/linux/setup-defconfig.inc
>
> # Add a run-time dependency for the PM firmware to be installed
> # on the target file system.
>-RDEPENDS_kernel-base_ti33x += "am33x-cm3 am33x-cm3-initscript"
>+RDEPENDS_kernel-base_append_ti33x = " am33x-cm3 am33x-cm3-
>initscript"
>
> # Default is to package all dtb files for ti33x devices unless
>building
> # for the specific beaglebone machine.
>--
>1.8.3.2
>
>_______________________________________________
>meta-ti mailing list
>meta-ti@yoctoproject.org
>https://lists.yoctoproject.org/listinfo/meta-ti

Re: [PATCH] linux-ti-staging: fix missing kernel image in /boot

[Denys Dmytriyenko]

On Wed, Sep 25, 2013 at 02:57:34PM -0400, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@ti.com>
> 
> We rely on kernel-base having run-time dependency on kernel-image, which
> normally would pull uImage/zImage into /boot directory of rootfs.
> Thanks to Chase for pointing me in the right direction by noticing that our
> addition of cm3 firmware breaks that dependency for ti33x.
> The reason for that is RDEPENDS is being conditionally assigned with ?=
> in kernel.bbclass and using += with that is unsafe/racy and _append should

A tiny clarification I lost here - using += together with machine-override on 
top of that ?= conditional is what is broken. _append makes it all work :)

> be used instead.
> 
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
>  recipes-kernel/linux/linux-ti-staging_3.8.bb | 2 +-
>  recipes-kernel/linux/linux-ti-staging_git.bb | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/recipes-kernel/linux/linux-ti-staging_3.8.bb b/recipes-kernel/linux/linux-ti-staging_3.8.bb
> index fd7b671..833fb48 100644
> --- a/recipes-kernel/linux/linux-ti-staging_3.8.bb
> +++ b/recipes-kernel/linux/linux-ti-staging_3.8.bb
> @@ -11,7 +11,7 @@ require recipes-kernel/linux/setup-defconfig.inc
>  
>  # Add a run-time dependency for the PM firmware to be installed
>  # on the target file system.
> -RDEPENDS_kernel-base_ti33x += "am33x-cm3 am33x-cm3-initscript"
> +RDEPENDS_kernel-base_append_ti33x = " am33x-cm3 am33x-cm3-initscript"
>  
>  # Default is to package all dtb files for ti33x devices unless building
>  # for the specific beaglebone machine.
> diff --git a/recipes-kernel/linux/linux-ti-staging_git.bb b/recipes-kernel/linux/linux-ti-staging_git.bb
> index e903215..778ea7f 100644
> --- a/recipes-kernel/linux/linux-ti-staging_git.bb
> +++ b/recipes-kernel/linux/linux-ti-staging_git.bb
> @@ -10,7 +10,7 @@ require recipes-kernel/linux/setup-defconfig.inc
>  
>  # Add a run-time dependency for the PM firmware to be installed
>  # on the target file system.
> -RDEPENDS_kernel-base_ti33x += "am33x-cm3 am33x-cm3-initscript"
> +RDEPENDS_kernel-base_append_ti33x = " am33x-cm3 am33x-cm3-initscript"
>  
>  # Default is to package all dtb files for ti33x devices unless building
>  # for the specific beaglebone machine.
> -- 
> 1.8.3.2
> 

Re: [PATCH] linux-ti-staging: fix missing kernel image in /boot

[Cooper Jr., Franklin]

Acked-by: Franklin Cooper Jr. <fcooper@ti.com>

> -----Original Message-----
> From: meta-ti-bounces@yoctoproject.org [mailto:meta-ti-
> bounces@yoctoproject.org] On Behalf Of Maupin, Chase
> Sent: Wednesday, September 25, 2013 2:07 PM
> To: Denys Dmytriyenko; meta-ti@yoctoproject.org
> Subject: Re: [meta-ti] [PATCH] linux-ti-staging: fix missing kernel image in /boot
> 
> Acked-by: Chase Maupin <chase.maupin@ti.com>
> 
> 
> 
> >-----Original Message-----
> >From: meta-ti-bounces@yoctoproject.org [mailto:meta-ti-
> >bounces@yoctoproject.org] On Behalf Of Denys Dmytriyenko
> >Sent: Wednesday, September 25, 2013 1:58 PM
> >To: meta-ti@yoctoproject.org
> >Subject: [meta-ti] [PATCH] linux-ti-staging: fix missing kernel image
> >in /boot
> >
> >From: Denys Dmytriyenko <denys@ti.com>
> >
> >We rely on kernel-base having run-time dependency on kernel-image,
> >which normally would pull uImage/zImage into /boot directory of rootfs.
> >Thanks to Chase for pointing me in the right direction by noticing that
> >our addition of cm3 firmware breaks that dependency for ti33x.
> >The reason for that is RDEPENDS is being conditionally assigned with ?=
> >in kernel.bbclass and using += with that is unsafe/racy and _append
> >should be used instead.
> >
> >Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> >---
> > recipes-kernel/linux/linux-ti-staging_3.8.bb | 2 +-
> >recipes-kernel/linux/linux-ti-staging_git.bb | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> >diff --git a/recipes-kernel/linux/linux-ti-staging_3.8.bb
> >b/recipes-kernel/linux/linux-ti-staging_3.8.bb
> >index fd7b671..833fb48 100644
> >--- a/recipes-kernel/linux/linux-ti-staging_3.8.bb
> >+++ b/recipes-kernel/linux/linux-ti-staging_3.8.bb
> >@@ -11,7 +11,7 @@ require recipes-kernel/linux/setup-defconfig.inc
> >
> > # Add a run-time dependency for the PM firmware to be installed  # on
> >the target file system.
> >-RDEPENDS_kernel-base_ti33x += "am33x-cm3 am33x-cm3-initscript"
> >+RDEPENDS_kernel-base_append_ti33x = " am33x-cm3 am33x-cm3-
> >initscript"
> >
> > # Default is to package all dtb files for ti33x devices unless
> >building  # for the specific beaglebone machine.
> >diff --git a/recipes-kernel/linux/linux-ti-staging_git.bb
> >b/recipes-kernel/linux/linux-ti-staging_git.bb
> >index e903215..778ea7f 100644
> >--- a/recipes-kernel/linux/linux-ti-staging_git.bb
> >+++ b/recipes-kernel/linux/linux-ti-staging_git.bb
> >@@ -10,7 +10,7 @@ require recipes-kernel/linux/setup-defconfig.inc
> >
> > # Add a run-time dependency for the PM firmware to be installed  # on
> >the target file system.
> >-RDEPENDS_kernel-base_ti33x += "am33x-cm3 am33x-cm3-initscript"
> >+RDEPENDS_kernel-base_append_ti33x = " am33x-cm3 am33x-cm3-
> >initscript"
> >
> > # Default is to package all dtb files for ti33x devices unless
> >building  # for the specific beaglebone machine.
> >--
> >1.8.3.2
> >
> >_______________________________________________
> >meta-ti mailing list
> >meta-ti@yoctoproject.org
> >https://lists.yoctoproject.org/listinfo/meta-ti
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti