diff options
| -rw-r--r-- | classes/kernel.bbclass | 10 | ||||
| -rw-r--r-- | conf/bitbake.conf | 2 |
2 files changed, 7 insertions, 5 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 diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 077e8e1e9a..4f00be73e6 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -164,7 +164,7 @@ P = "${PN}-${PV}" # Define a PR for kernels that machines can override so things like # modules get rebuilt -MACHINE_KERNEL_PR ?= "r0" +MACHINE_KERNEL_PR = "" # Base package name # Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial" |