Skip to contentSkip to conversation

linux-yocto: consolidated pull request

PATCH In review Bruce Ashfield 5 participants 11 messages Aug 19, 2011 – Aug 20, 2011

lore
Share & tools
lore

Bruce Ashfield

author
#0 lore raw

cover linux-yocto: consolidated pull request

Richard/Saul,

Here's a consolidated set of changes that I've been testing with for the past few days. The patches are pretty much self explanitory.

1/3: linux-yocto: restoring LINUX_VERSION ?= "3.0"

After discussions on the mailing list, we are going to go back to the 1.0 model and not cycle the version string of the recipe. We'll revisit this post 1.1.

2/3 linux-yocto: move more default values into linux-yocto.inc

While working on documentation for extending linux-yocto, I moved some variables into the .inc file to simply recipes based on linux-yocto. I haven't updated some other recipes yet (like the -rt one), but will do that once I can test them.

3/3 linux-yocto: update SRCREVs for 3.0.3

Updating the SRCREVs to pickup 3.0.3, this also picks up the meta branch updates for emgd and hpet.

cc Tom Zanussi <[email protected]>
cc Darren Hart <[email protected]>

The following changes since commit 978cdd5cb5b445f1cf406296444cb57cd8aa526a:

kernel: restore crtsavres.o to enable building external modules on powerpc (2011-08-17 15:56:07 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib zedd/kernel-oe
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-oe

Bruce Ashfield (3):
linux-yocto: restoring LINUX_VERSION ?= "3.0"
linux-yocto: move more default values into linux-yocto.inc
linux-yocto: update SRCREVs for 3.0.3

 meta/recipes-kernel/linux/linux-yocto.inc    |    7 +++++++
 meta/recipes-kernel/linux/linux-yocto_3.0.bb |   21 ++++++++-------------
 2 files changed, 15 insertions(+), 13 deletions(-)
Signature · 1 line
1.7.4.1
author
#1 lore raw

PATCH 1/3 linux-yocto: restoring LINUX_VERSION ?= "3.0"

There are enough other recipes/layers and users that are currently using PREFERRED_VERSION that changing the value to 3.0.x does not work at the current time. So we'll restore this to 3.0 and follow the same model as previous releases. Using DEFAULT_PREFERENCE and other schemes will be considered in the future.

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto_3.0.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-kernel/linux/linux-yocto_3.0.bb +1 -1
index 44f1ebe..5d9871f 100644
@@ -11,7 +11,7 @@ KMACHINE_qemuarm  = "yocto/standard/arm-versatile-926ejs"
 KBRANCH = ${KMACHINE}
 KMETA = meta
 
-LINUX_VERSION ?= "3.0.1"
+LINUX_VERSION ?= "3.0"
 LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
 
 SRCREV_machine_qemuarm = "36b4cdddcafc711f0ec9ad97882f23a6443c61b2"
Signature · 1 line
1.7.4.1
#2 lore raw

Re: [PATCH 1/3] linux-yocto: restoring LINUX_VERSION ?= "3.0"

meta/recipes-kernel/linux/linux-yocto_3.0.bb KMACHINE_qemuarm = "yocto/standard/arm-versatile-926ejs" · line 17

Quoted 13 lines · Bruce Ashfield
meta/recipes-kernel/linux/linux-yocto_3.0.bb +1 -1
index 44f1ebe..5d9871f 100644
@@ -11,7 +11,7 @@ KMACHINE_qemuarm  = "yocto/standard/arm-versatile-926ejs"
 KBRANCH = ${KMACHINE}
 KMETA = meta
 
-LINUX_VERSION ?= "3.0.1"
+LINUX_VERSION ?= "3.0"
 LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
 
 SRCREV_machine_qemuarm = "36b4cdddcafc711f0ec9ad97882f23a6443c61b2"

That's going to cause PV to go backwards, right? If you're going to do that then you probably ought to consider bumping PE to retain monotonicity.

p.

#3 lore raw

Re: [PATCH 1/3] linux-yocto: restoring LINUX_VERSION ?= "3.0"

Quoted 13 lines · Phil Blundell
Quoted 12 lines · Bruce Ashfield
meta/recipes-kernel/linux/linux-yocto_3.0.bb +0 -0
index 44f1ebe..5d9871f 100644
@@ -11,7 +11,7 @@ KMACHINE_qemuarm  = "yocto/standard/arm-versatile-926ejs"
  KBRANCH = ${KMACHINE}

 KMETA = meta

meta/recipes-kernel/linux/linux-yocto_3.0.bb +1 -1
-LINUX_VERSION ?= "3.0.1"
+LINUX_VERSION ?= "3.0"

 LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"

Quoted 5 lines
Quoted 1 line

 SRCREV_machine_qemuarm = "36b4cdddcafc711f0ec9ad97882f23a6443c61b2"

That's going to cause PV to go backwards, right?  If you're going to do that then you probably ought to consider bumping PE to retain monotonicity.

Indeed. I always just think of LINUX_VERSION as yet another package internal variable (from non-bitbake experience), so tweaking it has no impact on this sort
of thing.

I can look into changing the epoch .. but not until Monday or later in the weekend.

Cheers,

Bruce

Quoted 10 lines

p.

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
#4 lore raw

Re: [PATCH 1/3] linux-yocto: restoring LINUX_VERSION ?= "3.0"

Quoted 20 lines · Bruce Ashfield
Quoted 13 lines · Phil Blundell
Quoted 12 lines · Bruce Ashfield
meta/recipes-kernel/linux/linux-yocto_3.0.bb +1 -1
index 44f1ebe..5d9871f 100644
@@ -11,7 +11,7 @@ KMACHINE_qemuarm  = "yocto/standard/arm-versatile-926ejs"
 KBRANCH = ${KMACHINE}
 KMETA = meta
 
-LINUX_VERSION ?= "3.0.1"
+LINUX_VERSION ?= "3.0"
 LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
Quoted 5 lines

meta/recipes-kernel/linux/linux-yocto_3.0.bb KMACHINE_qemuarm = "yocto/standard/arm-versatile-926ejs" · line 17

Quoted 1 line
meta/recipes-kernel/linux/linux-yocto_3.0.bb +0 -0
 SRCREV_machine_qemuarm = "36b4cdddcafc711f0ec9ad97882f23a6443c61b2"

That's going to cause PV to go backwards, right? If you're going to do that then you probably ought to consider bumping PE to retain monotonicity.

Quoted 7 lines

Indeed. I always just think of LINUX_VERSION as yet another package internal variable (from non-bitbake experience), so tweaking it has no impact on this sort
of thing.

I can look into changing the epoch .. but not until Monday or later in the weekend.

I'm not 100% convinced that this is a good idea. I'd really prefer the kernel accurately reflected the version it was. Can we not do:

PREFERRRED_VERSION_xxx = "3.0%"

to get around the preferred version issues?

Cheers,

Richard

#5 lore raw

Re: [PATCH 1/3] linux-yocto: restoring LINUX_VERSION ?= "3.0"

Quoted 6 lines · Richard Purdie

I'm not 100% convinced that this is a good idea. I'd really prefer the kernel accurately reflected the version it was. Can we not do:

PREFERRRED_VERSION_xxx = "3.0%"

yes I would prefer that too

Quoted 4 lines

to get around the preferred version issues?

Cheers,

#6 lore raw

Re: [PATCH 1/3] linux-yocto: restoring LINUX_VERSION ?= "3.0"

In reply to Richard Purdie
Quoted 29 lines · Richard Purdie
Quoted 20 lines · Bruce Ashfield
Quoted 13 lines · Phil Blundell
Quoted 12 lines · Bruce Ashfield
meta/recipes-kernel/linux/linux-yocto_3.0.bb +0 -0
index 44f1ebe..5d9871f 100644
@@ -11,7 +11,7 @@ KMACHINE_qemuarm  = "yocto/standard/arm-versatile-926ejs"
  KBRANCH = ${KMACHINE}

 KMETA = meta

meta/recipes-kernel/linux/linux-yocto_3.0.bb +1 -1
-LINUX_VERSION ?= "3.0.1"
+LINUX_VERSION ?= "3.0"

 LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"

Quoted 5 lines
Quoted 1 line

 SRCREV_machine_qemuarm = "36b4cdddcafc711f0ec9ad97882f23a6443c61b2"

That's going to cause PV to go backwards, right?  If you're going to do that then you probably ought to consider bumping PE to retain monotonicity.

Quoted 7 lines

Indeed. I always just think of LINUX_VERSION as yet another package internal variable (from non-bitbake experience), so tweaking it has no impact on this sort
of thing.

I can look into changing the epoch .. but not until Monday or later in the weekend.

Quoted 6 lines

I'm not 100% convinced that this is a good idea. I'd really prefer the kernel accurately reflected the version it was. Can we not do:

PREFERRRED_VERSION_xxx = "3.0%"

to get around the preferred version issues?

Both Darren and I tried variants of this but couldn't get it to match, but I can certainly try again. This was also my first attempt when bumping the string.

But as I mentioned multiple times before, even changing the version with sub releases is a change from how I handled it before, so from that point of view, I never should have entered into tweaking this. :)

Bruce

Quoted 11 lines

Cheers,

Richard

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
#7 lore raw

Re: [PATCH 1/3] linux-yocto: restoring LINUX_VERSION ?= "3.0"

Quoted 31 lines · Bruce Ashfield
Quoted 29 lines · Richard Purdie
Quoted 27 lines · Bruce Ashfield
Quoted 13 lines · Phil Blundell
Quoted 12 lines · Bruce Ashfield
meta/recipes-kernel/linux/linux-yocto_3.0.bb +0 -0
index 44f1ebe..5d9871f 100644
@@ -11,7 +11,7 @@ KMACHINE_qemuarm  = "yocto/standard/arm-versatile-926ejs"
  KBRANCH = ${KMACHINE}

 KMETA = meta

meta/recipes-kernel/linux/linux-yocto_3.0.bb +1 -1
-LINUX_VERSION ?= "3.0.1"
+LINUX_VERSION ?= "3.0"

 LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"

Quoted 5 lines
Quoted 1 line

 SRCREV_machine_qemuarm = "36b4cdddcafc711f0ec9ad97882f23a6443c61b2"

That's going to cause PV to go backwards, right?  If you're going to do that then you probably ought to consider bumping PE to retain monotonicity.

Indeed. I always just think of LINUX_VERSION as yet another package internal variable (from non-bitbake experience), so tweaking it has no impact on this sort
of thing.

I can look into changing the epoch .. but not until Monday or later in the weekend.

Quoted 6 lines
Quoted 6 lines

I'm not 100% convinced that this is a good idea. I'd really prefer the kernel accurately reflected the version it was. Can we not do:

PREFERRRED_VERSION_xxx = "3.0%"

to get around the preferred version issues?

I reset my environment and re-did my tests .. and this does match what we want. I'm gong to re-spin my series with a version bump to 3.0.3 and I'll update the preferred versions that I know about to this format.

Cheers,

Bruce

Quoted 28 lines

Both Darren and I tried variants of this but couldn't get it to match, but I can certainly try again. This was also my first attempt when bumping the string.

But as I mentioned multiple times before, even changing the version with sub releases is a change from how I handled it before, so from that point of view, I never should have entered into tweaking this. :)

Bruce

Quoted 11 lines

Cheers,

Richard

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"

Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
author
#8 lore raw

PATCH 2/3 linux-yocto: move more default values into linux-yocto.inc

In reply to Bruce Ashfield

During the preparation of some linux-yocto extension documentation it was clear that some variables are being defined in each recipe, when they don't have to be. Moving the defaults into linux-yocto.in and allowing them to be overidden in recipes simpifies the re-use of the base infrastructure.

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto.inc    |    7 +++++++
 meta/recipes-kernel/linux/linux-yocto_3.0.bb |    5 -----
 2 files changed, 7 insertions(+), 5 deletions(-)
meta/recipes-kernel/linux/linux-yocto.inc +7 -0
index 595795b..11b77ce 100644
@@ -12,6 +12,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 # Set this to 'preempt_rt' in the local.conf if you want a real time kernel
 LINUX_KERNEL_TYPE ?= standard
 
+KMETA ?= meta
+SRCREV_FORMAT ?= "meta_machine" 
+
+LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
+KERNEL_REVISION_CHECKING ?= "t"
+YOCTO_KERNEL_META_DATA ?= t
+
 do_patch[depends] = "kern-tools-native:do_populate_sysroot"
 
 addtask kernel_configme before do_configure after do_patch
meta/recipes-kernel/linux/linux-yocto_3.0.bb +0 -5
index 5d9871f..3ebd830 100644
@@ -9,10 +9,8 @@ KMACHINE_qemumips = "yocto/standard/mti-malta32-be"
 KMACHINE_qemuarm  = "yocto/standard/arm-versatile-926ejs"
 
 KBRANCH = ${KMACHINE}
-KMETA = meta
 
 LINUX_VERSION ?= "3.0"
-LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
 
 SRCREV_machine_qemuarm = "36b4cdddcafc711f0ec9ad97882f23a6443c61b2"
 SRCREV_machine_qemumips = "2db2aacc589a518a74e8a8543e80403f09de8134"

@@ -31,14 +29,11 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;nocheckout=1;
 COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)"
 
 # Functionality flags
-KERNEL_REVISION_CHECKING ?= "t"
 KERNEL_FEATURES="features/netfilter"
 KERNEL_FEATURES_append=" features/taskstats"
 KERNEL_FEATURES_append_qemux86=" cfg/sound"
 KERNEL_FEATURES_append_qemux86-64=" cfg/sound"
 
-YOCTO_KERNEL_META_DATA=t
-
 # extra tasks
 addtask kernel_link_vmlinux after do_compile before do_install
 addtask validate_branches before do_patch after do_kernel_checkout
Signature · 1 line
1.7.4.1
author
#9 lore raw

PATCH 3/3 linux-yocto: update SRCREVs for 3.0.3

In reply to Bruce Ashfield

Updating the SRCREVs to pickup the kernel.org -stable update for 3.0.3

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto_3.0.bb |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
meta/recipes-kernel/linux/linux-yocto_3.0.bb +7 -7
index 3ebd830..fa33a76 100644
@@ -12,13 +12,13 @@ KBRANCH = ${KMACHINE}
 
 LINUX_VERSION ?= "3.0"
 
-SRCREV_machine_qemuarm = "36b4cdddcafc711f0ec9ad97882f23a6443c61b2"
-SRCREV_machine_qemumips = "2db2aacc589a518a74e8a8543e80403f09de8134"
-SRCREV_machine_qemuppc = "c0f5dd4ef37b445d8ac73b11dd93e0ffdb7e9f6d"
-SRCREV_machine_qemux86 = "c29beadfd4364aca9358ac0fdb8356c1dbbdacb2"
-SRCREV_machine_qemux86-64 = "d0b814813bce09971c5cbb0d22bacb8842146fa0"
-SRCREV_machine = "ad13129a87957656c18584793abcee51de0e196a"
-SRCREV_meta = "9da70812ecddee0f7eeb11675f29497cb997275e"
+SRCREV_machine_qemuarm = "083e3befb5f2562e1375f19e645f1e024c92b0b2"
+SRCREV_machine_qemumips = "79f46ece4d5e54fce49442f575a4b8663012dfa2"
+SRCREV_machine_qemuppc = "f1ce5cf96659e036674eddd170633caaf3c1d487"
+SRCREV_machine_qemux86 = "d44ab16a5c0aa5fed2ef2f587bd90cad37132dbd"
+SRCREV_machine_qemux86-64 = "842be4e7221f982e0a76075cf556a9354991ff94"
+SRCREV_machine = "66398ee1195e1b142a1b540795ff16e04b32467f"
+SRCREV_meta = "d588bdafc0d9b4d2386144b7d76a1d379e2d16c0"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
1.7.4.1
#10 lore raw
In reply to Bruce Ashfield
Quoted 10 lines · Bruce Ashfield

Richard/Saul,

Here's a consolidated set of changes that I've been testing with for the past few days. The patches are pretty much self explanitory.

1/3:  linux-yocto: restoring LINUX_VERSION ?= "3.0"

After discussions on the mailing list, we are going to go back to the 1.0 model and not cycle the version string of the recipe. We'll revisit this post 1.1.

I've repushed this series with 1/3 dropped.

Quoted 8 lines

2/3  linux-yocto: move more default values into linux-yocto.inc

While working on documentation for extending linux-yocto, I moved some variables into the .inc file to simply recipes based on linux-yocto. I haven't updated some other recipes yet (like the -rt one), but will do that once I can test them.

Quoted 4 lines

3/3 linux-yocto: update SRCREVs for 3.0.3

Updating the SRCREVs to pickup 3.0.3, this also picks up the meta branch updates for emgd and hpet.

And this changed to make the kernel version 3.0.3.

I'm sparing everyone another patch posting, but let me know if you'd like me to resend.

Bruce

Quoted 30 lines
cc Tom Zanussi <[email protected]>
cc Darren Hart <[email protected]>

The following changes since commit 978cdd5cb5b445f1cf406296444cb57cd8aa526a:

 kernel: restore crtsavres.o to enable building external modules on powerpc (2011-08-17 15:56:07 +0100)

are available in the git repository at:
 git://git.pokylinux.org/poky-contrib zedd/kernel-oe
 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-oe

Bruce Ashfield (3):
 linux-yocto: restoring LINUX_VERSION ?= "3.0"
 linux-yocto: move more default values into linux-yocto.inc
 linux-yocto: update SRCREVs for 3.0.3

 meta/recipes-kernel/linux/linux-yocto.inc    |    7 +++++++ meta/recipes-kernel/linux/linux-yocto_3.0.bb |   21 ++++++++-------------

 2 files changed, 15 insertions(+), 13 deletions(-)

--
1.7.4.1

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"