* [STABLE][PATCH] fix for MACHINE_KERNEL_PR stuff
@ 2009-06-17 12:10 Marcin Juszkiewicz
2009-06-17 12:42 ` Marcin Juszkiewicz
0 siblings, 1 reply; 4+ messages in thread
From: Marcin Juszkiewicz @ 2009-06-17 12:10 UTC (permalink / raw)
To: openembedded-devel
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@juszkiewicz.com.pl>
---
classes/kernel.bbclass | 10 ++++++----
conf/bitbake.conf | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 1323228..b18dfab 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 077e8e1..4f00be7 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"
--
1.6.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [STABLE][PATCH] fix for MACHINE_KERNEL_PR stuff
2009-06-17 12:10 [STABLE][PATCH] fix for MACHINE_KERNEL_PR stuff Marcin Juszkiewicz
@ 2009-06-17 12:42 ` Marcin Juszkiewicz
2009-06-17 12:59 ` Koen Kooi
0 siblings, 1 reply; 4+ messages in thread
From: Marcin Juszkiewicz @ 2009-06-17 12:42 UTC (permalink / raw)
To: openembedded-devel
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@juszkiewicz.com.pl>
---
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"
--
1.6.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [STABLE][PATCH] fix for MACHINE_KERNEL_PR stuff
2009-06-17 12:42 ` Marcin Juszkiewicz
@ 2009-06-17 12:59 ` Koen Kooi
2009-06-17 15:32 ` Philip Balister
0 siblings, 1 reply; 4+ messages in thread
From: Koen Kooi @ 2009-06-17 12:59 UTC (permalink / raw)
To: openembedded-devel
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@juszkiewicz.com.pl>
Acked-by: Koen Kooi <koen@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"
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [STABLE][PATCH] fix for MACHINE_KERNEL_PR stuff
2009-06-17 12:59 ` Koen Kooi
@ 2009-06-17 15:32 ` Philip Balister
0 siblings, 0 replies; 4+ messages in thread
From: Philip Balister @ 2009-06-17 15:32 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 2795 bytes --]
Acked-by: Philip Balister <philip@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@juszkiewicz.com.pl>
>
> Acked-by: Koen Kooi <koen@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@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/x-pkcs7-signature, Size: 3303 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-06-17 15:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-17 12:10 [STABLE][PATCH] fix for MACHINE_KERNEL_PR stuff Marcin Juszkiewicz
2009-06-17 12:42 ` Marcin Juszkiewicz
2009-06-17 12:59 ` Koen Kooi
2009-06-17 15:32 ` Philip Balister
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.