diff options
| author | Tom Zanussi <tom.zanussi@intel.com> | 2012-12-12 22:56:38 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-13 16:54:34 +0000 |
| commit | 6c7f42666345e546834303171b49a95a888e0144 (patch) | |
| tree | 96028c2e6fdf791dafc922f146efc910e8554c57 | |
| parent | 5fc9990ef66e844012bd026f89d060c36a48209f (diff) | |
| download | poky-6c7f42666345e546834303171b49a95a888e0144.tar.gz | |
yocto-kernel: remove assumption that kernel has a version
Kernels don't need to have a PREFERRED_VERSION, so remove that
assumption from the code that looks for the kernel definition.
(From meta-yocto rev: 2ea9d54ac5ebd80b5306851d62411960f3293ede)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | scripts/lib/bsp/kernel.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/lib/bsp/kernel.py b/scripts/lib/bsp/kernel.py index 272c3eb5a2..f2ec9fd64f 100644 --- a/scripts/lib/bsp/kernel.py +++ b/scripts/lib/bsp/kernel.py | |||
| @@ -289,6 +289,8 @@ def find_current_kernel(bsp_layer, machine): | |||
| 289 | 289 | ||
| 290 | if preferred_kernel and preferred_kernel_version: | 290 | if preferred_kernel and preferred_kernel_version: |
| 291 | return preferred_kernel + "_" + preferred_kernel_version | 291 | return preferred_kernel + "_" + preferred_kernel_version |
| 292 | elif preferred_kernel: | ||
| 293 | return preferred_kernel | ||
| 292 | 294 | ||
| 293 | 295 | ||
| 294 | def find_bsp_kernel_src_uri(scripts_path, machine, start_end_only = False): | 296 | def find_bsp_kernel_src_uri(scripts_path, machine, start_end_only = False): |