diff options
| author | Denys Dmytriyenko <denys@ti.com> | 2013-09-25 14:49:14 -0400 |
|---|---|---|
| committer | Denys Dmytriyenko <denys@ti.com> | 2013-09-25 16:57:08 -0400 |
| commit | 7b4870a30d8a151be5683adb97bb319b615afc81 (patch) | |
| tree | f42668fec628c250201c9877abb44538e2989ec3 | |
| parent | ccc9b8c50c1df3df24939c33e09e0940511d9a90 (diff) | |
| download | meta-ti-7b4870a30d8a151be5683adb97bb319b615afc81.tar.gz | |
linux-ti-staging: fix missing kernel image in /boot
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 machine-override clears that value due
to the order of processing. Hence _append should be used instead of += to
process it after the machine-override takes place.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Acked-by: Chase Maupin <chase.maupin@ti.com>
Acked-by: Franklin Cooper Jr. <fcooper@ti.com>
| -rw-r--r-- | recipes-kernel/linux/linux-ti-staging_3.8.bb | 2 | ||||
| -rw-r--r-- | 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 fd7b671b..833fb48a 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 | |||
| 11 | 11 | ||
| 12 | # Add a run-time dependency for the PM firmware to be installed | 12 | # Add a run-time dependency for the PM firmware to be installed |
| 13 | # on the target file system. | 13 | # on the target file system. |
| 14 | RDEPENDS_kernel-base_ti33x += "am33x-cm3 am33x-cm3-initscript" | 14 | RDEPENDS_kernel-base_append_ti33x = " am33x-cm3 am33x-cm3-initscript" |
| 15 | 15 | ||
| 16 | # Default is to package all dtb files for ti33x devices unless building | 16 | # Default is to package all dtb files for ti33x devices unless building |
| 17 | # for the specific beaglebone machine. | 17 | # 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 e9032159..778ea7f9 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 | |||
| 10 | 10 | ||
| 11 | # Add a run-time dependency for the PM firmware to be installed | 11 | # Add a run-time dependency for the PM firmware to be installed |
| 12 | # on the target file system. | 12 | # on the target file system. |
| 13 | RDEPENDS_kernel-base_ti33x += "am33x-cm3 am33x-cm3-initscript" | 13 | RDEPENDS_kernel-base_append_ti33x = " am33x-cm3 am33x-cm3-initscript" |
| 14 | 14 | ||
| 15 | # Default is to package all dtb files for ti33x devices unless building | 15 | # Default is to package all dtb files for ti33x devices unless building |
| 16 | # for the specific beaglebone machine. | 16 | # for the specific beaglebone machine. |