diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-04-06 15:24:46 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-04-06 15:24:46 +0200 |
| commit | a1cfcd46c9c36fd4bbdebfeb1e4ddf7cf1ae4524 (patch) | |
| tree | 448e430820ab35ca236a047a6a1c48e001e2484d /classes | |
| parent | 0af831dd348e3f321585cb2359c5c5991e48518d (diff) | |
| parent | c273263b147da671b5ee105eb85d4302daf33555 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/kernel.bbclass | 4 | ||||
| -rw-r--r-- | classes/module-base.bbclass | 4 |
2 files changed, 8 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"]}" |