diff options
| author |   Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2009-06-17 02:42:53 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@openembedded.org> | 2009-06-17 19:06:22 +0200 |
| commit | b12cde785d3c109d7ac1d8305b25e7fa84481d1a (patch) | |
| tree | 3dbe3ad8e722f447a7d53acf295cdb79234be282 /classes | |
| parent | 86f5c5bb7ed4bc2ada0dae0c3bf047f62eb6a2f4 (diff) | |
| download | openembedded-b12cde785d3c109d7ac1d8305b25e7fa84481d1a.tar.gz | |
fix for MACHINE_KERNEL_PR stuff
This patch unbreaks current behaviour which was introduced by
MACHINE_KERNEL_PR variable.
As most of target machines do not use it they have PR with broken value
(set to "r0" instead of value in recipe). I took other way which makes
both types of users happy -- those with MACHINE_KERNEL_PR in use and
those without it.
By default we set M_K_PR to empty string instead of "r0" - this allows
to check is it set at all or not. If it is set then we set PR to this value.
Otherwise we ignore existance of that variable and use PR from recipe.
Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Philip Balister <philip@balister.org>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/kernel.bbclass | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 954c407d51..278aec18d7 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -20,6 +20,11 @@ python __anonymous () { image = bb.data.getVar('INITRAMFS_IMAGE', d, True) if image != '' and image is not None: bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d) + + machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True) + + if machine_kernel_pr: + bb.data.setVar('PR', machine_kernel_pr, d) } INITRAMFS_IMAGE ?= "" @@ -64,10 +69,6 @@ export CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "tt KERNEL_VERSION = "${@get_kernelversion('${S}')}" KERNEL_MAJOR_VERSION = "${@get_kernelmajorversion('${KERNEL_VERSION}')}" -# A machine.conf or local.conf can increase MACHINE_KERNEL_PR to force -# rebuilds for kernel and external modules -PR = "${MACHINE_KERNEL_PR}" - KERNEL_LOCALVERSION ?= "" # kernels are generally machine specific |