[oe] [STABLE][PATCH] fix for MACHINE_KERNEL_PR stuff

[Philip Balister]

Acked-by: Philip Balister <philip at balister.org>

Koen Kooi wrote:
> On 17-06-09 14:42, Marcin Juszkiewicz wrote:
>> This patch unbreaks current behaviour which was introduced by
>> MACHINE_KERNEL_PR variable.
>>
>> As most of target machines do not use it they have PR with broken value
>> (set to "r0" instead of value in recipe). I took other way which makes
>> both types of users happy -- those with MACHINE_KERNEL_PR in use and
>> those without it.
>>
>> By default we set M_K_PR to empty string instead of "r0" - this allows
>> to check is it set at all or not. If it is set then we set PR to this 
>> value.
>> Otherwise we ignore existance of that variable and use PR from recipe.
>>
>> Signed-off-by: Marcin Juszkiewicz<marcin at juszkiewicz.com.pl>
> 
> Acked-by: Koen Kooi <koen at openembedded.org>
> 
> 
>> ---
>>   classes/kernel.bbclass |    9 +++++----
>>   conf/bitbake.conf      |    2 +-
>>   2 files changed, 6 insertions(+), 5 deletions(-)
>>
>> diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
>> index 954c407..278aec1 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
>> diff --git a/conf/bitbake.conf b/conf/bitbake.conf
>> index c411b95..9333b4e 100644
>> --- a/conf/bitbake.conf
>> +++ b/conf/bitbake.conf
>> @@ -159,7 +159,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"
> 
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 3303 bytes
Desc: S/MIME Cryptographic Signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20090617/cc8ad27b/attachment-0002.bin>