summaryrefslogtreecommitdiff
path: root/classes/kernel.bbclass
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2009-06-17 14:35:30 +0100
committerPhil Blundell <philb@gnu.org>2009-06-17 14:35:30 +0100
commitc31afe4d59396126aed32352f00ef66f2bcb5f17 (patch)
tree493be0a8c2baa3560a94dab167c749933c58b3ec /classes/kernel.bbclass
parentcbef7988989e4a0ca7822c78a58b5da6bbc6eb6b (diff)
parent40c8b7516530ad65160841f6e79e40475d02d471 (diff)
Merge branch 'org.openembedded.dev' of git@new.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'classes/kernel.bbclass')
-rw-r--r--classes/kernel.bbclass9
1 files changed, 5 insertions, 4 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index ae7e643ca7..ef16669c3d 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