diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-06-17 14:11:06 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-06-17 14:11:06 +0200 |
| commit | b945c7446b2134bf69f42909b1e8b23e3fd8bbfe (patch) | |
| tree | 31eac510b5ffe777e88c981204a83bcf5128ed22 /classes | |
| parent | 19f35a34bc1c98e684b96306b377d230e367c49f (diff) | |
| parent | 35e7b34d3b5b96ed11bc7ed6b2a5d08e6183d8a3 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/kernel.bbclass | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 1323228a74..b18dfab796 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -20,6 +20,12 @@ 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) + + pr = bb.data.getVar('PR', d, True) + 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 +70,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 |