diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-04-06 08:56:14 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-04-06 08:56:14 +0200 |
| commit | 389043beaee17cd6bc90e5c8e7140fdab51c9ae8 (patch) | |
| tree | 54476b6b419a180dd0a7166fdbb9117b874b679d | |
| parent | 45c1142d3e0fc422277cf4671613aa9b61bf010f (diff) | |
kernel,module-base class, bitbake.conf: introduce MACHINE_KERNEL_PR
* bandaid till we have a better way to track ABI changes
| -rw-r--r-- | classes/kernel.bbclass | 4 | ||||
| -rw-r--r-- | classes/module-base.bbclass | 4 | ||||
| -rw-r--r-- | conf/bitbake.conf | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 17e8941745..954c407d51 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -64,6 +64,10 @@ 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/classes/module-base.bbclass b/classes/module-base.bbclass index c98baceeab..bc53e1bad5 100644 --- a/classes/module-base.bbclass +++ b/classes/module-base.bbclass @@ -5,6 +5,10 @@ inherit kernel-arch export OS = "${TARGET_OS}" export CROSS_COMPILE = "${TARGET_PREFIX}" +# A machine.conf or local.conf can increase MACHINE_KERNEL_PR to force +# rebuilds for kernel and external modules +PR = "${MACHINE_KERNEL_PR}" + export KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}" export KERNEL_SOURCE = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')}" KERNEL_OBJECT_SUFFIX = "${@[".o", ".ko"][base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion') > "2.6.0"]}" diff --git a/conf/bitbake.conf b/conf/bitbake.conf index a0d652a26d..136f01c228 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -162,6 +162,10 @@ EXTENDPEVER = "${@['','${PE\x7d:'][bb.data.getVar('PE',d,1) > 0]}" EXTENDPV = "${EXTENDPEVER}${PV}-${PR}${DISTRO_PR}" P = "${PN}-${PV}" +# Define a PR for kernels that machines can override so things like +# modules get rebuilt +MACHINE_KERNEL_PR ?= "r0" + # Base package name # Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial" # otherwise it is the same as PN and P |