From: Eric Bénard <eric@eukrea.com>
Date: Mon, 3 May 2010 21:13:47 +0000 (+0200)
Subject: module-base.bbclass: keep PR if MACHINE_KERNEL_PR is not set
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2f3cff6cfcd46a0dae0e0f90e27fc246c6edc32;p=openembedded.git

module-base.bbclass: keep PR if MACHINE_KERNEL_PR is not set

Signed-off-by: Eric Bénard <eric@eukrea.com>
Acked-by: Phil Blundell <philb@gnu.org>
---

diff --git a/classes/module-base.bbclass b/classes/module-base.bbclass
index bc53e1bad5..9aaaa4e8e3 100644
--- a/classes/module-base.bbclass
+++ b/classes/module-base.bbclass
@@ -7,7 +7,12 @@ 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}"
+python __anonymous () {
+    machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True)
+
+    if machine_kernel_pr:
+       bb.data.setVar('PR', machine_kernel_pr, d)
+}
 
 export KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}"
 export KERNEL_SOURCE = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')}"