linux-yocto: consolidated kernel pull request

PATCH In review Bruce Ashfield 3 participants 10 messages Aug 24, 2011 – Aug 25, 2011

lore

Share & tools

lore

Bruce Ashfield

author

2011-08-24 20:55 UTC #0 lore raw

cover linux-yocto: consolidated kernel pull request

Richard/Saul,

Here's a consolidated kernel pull request that fixes a series of bugs that have been around for a while and fixes some of the remaining issues from the -rt work that completed last week.

Darren: I also updated the -rt source revs and recipe with some streamlining that builds on top of changse that merged last week.

The patches have the details of the bugs and fixes.

cc Darren Hart <[email protected]>

The following changes since commit f852199ff598069bbecad4146f13377753df1648:

linux-yocto: update meta SRCREVs for beagleboard config changes (2011-08-24 16:29:22 -0400)

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

Bruce Ashfield (4):
kern-tools: allow flexible branch points
linux-yocto-rt: update qemuppc support and streamline variables
linux-yocto: update machines and default configuration linux-yocto/2.6.37: apmd + get time of day fixes

 .../kern-tools/kern-tools-native_git.bb            |    2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb    |   11 ++++-------
 meta/recipes-kernel/linux/linux-yocto_2.6.37.bb    |   12 ++++++------
 meta/recipes-kernel/linux/linux-yocto_3.0.bb       |   14 +++++++-------
 4 files changed, 18 insertions(+), 21 deletions(-)

Signature · 1 line

1.7.4.1

Bruce Ashfield

author

2011-08-24 20:55 UTC #1 lore raw

PATCH 1/4 kern-tools: allow flexible branch points

Updating the SRCREV to pickup a series of changes to the kern-tools that allow more flexible creation of trees from scratch. This functionality is not used by the normal kernel build process and has no impact on existing builds.

Signed-off-by Bruce Ashfield <[email protected]>

---
 .../kern-tools/kern-tools-native_git.bb            |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +1 -1

index 5659252..1649bbc 100644
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8
 
 DEPENDS = "git-native guilt-native"
 
-SRCREV = "40d9bab24bde4c2f94a0cece153663aa93e0f9a4"
+SRCREV = "eab0c4eeb9fdb3d83e7aca4b70334cc7b02540b6"
 PR = r10
 PV = "0.1+git${SRCPV}"

Signature · 1 line

1.7.4.1

Bruce Ashfield

author

2011-08-24 20:55 UTC #2 lore raw

PATCH 2/4 linux-yocto-rt: update qemuppc support and streamline variables

In reply to Bruce Ashfield

Fixes [YOCTO #1391]
Fixes [YOCTO #1389]

qemuppc must have a dedicated branch for -rt support, since it has board specific patches that are not suitable for a common location. This fixes the boot by propagating some common fixes and by syncing to the latest meta-configuration.

There are some variables that are now in linux-yocto.inc and need not be defined by the kernel recipe itself, so we can safely remove them with no impact on the build.

CC Darren Hart <[email protected]>

Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +4 -7

index c8a175d..61210de 100644
@@ -9,14 +9,14 @@ KMACHINE_qemuppc  = "qemu-ppc32"
 KMACHINE_qemumips = "mti-malta32-be"
 
 KBRANCH = "yocto/standard/preempt-rt/base"
-KMETA = meta
+KBRANCH_qemuppc = "yocto/standard/preempt-rt/qemu-ppc32"
 
 LINUX_VERSION ?= "3.0"
 LINUX_KERNEL_TYPE = "preempt-rt"
-LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
 
-SRCREV_machine = "7e1e5b6c8a13c615feb0d7b6d37988a094aae98f"
-SRCREV_meta = "7782fc673afd6a1c742409896ae787560d96fce8"
+SRCREV_machine ?= "67ce0924042a2faa12b71ac3e92175c789c32af6"
+SRCREV_machine_qemuppc ?= "839638f4efda0c70c6f491161ab2c042f5bc3e66"
+SRCREV_meta ?= "13dbce30d6a647228bf5a9483a9b9c2da1514f78"
 
 PR = "r0"
 PV = "${LINUX_VERSION}+git${SRCPV}"

@@ -30,14 +30,11 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0.git;protocol=git;nocheckou
 COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm)"
 
 # 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

Bruce Ashfield

author

2011-08-24 20:55 UTC #3 lore raw

PATCH 3/4 linux-yocto: update machines and default configuration

In reply to Bruce Ashfield

Fixes [YOCTO: #686]

During routine maintenance some base changes were re-wound on the common branches. All machines still had these changes, but any new machine branched from the common base would miss those changes. This update restores those commits to the standard branch and merges them out to all child branches.

The meta branch update adds a configuration item to support live image booting on qemux86.

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 08d09d3..a5e208b 100644
@@ -12,13 +12,13 @@ KBRANCH = ${KMACHINE}
 
 LINUX_VERSION ?= "3.0.3"
 
-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 = "4d2805c96fe229fa0390d2fafc15d49df9acc595"
+SRCREV_machine_qemuarm ?= "eecaa32095ab63e0a73f161cf48fd02251eb6c88"
+SRCREV_machine_qemumips ?= "eee3cb2066bb6aae5b3869083cb477b03eb87c79"
+SRCREV_machine_qemuppc ?= "c0da1d35dee9fb63ba6bfc7907a77b0feb89766e"
+SRCREV_machine_qemux86 ?= "8b51ddba0f85a6bb8e105b37a9ac03fb58b9de20"
+SRCREV_machine_qemux86-64 ?= "965dd365cf3652347960f7145ac188c86c323070"
+SRCREV_machine ?= "49d93fb0c9e1645ba0bb8951be23e56ea227a5bd"
+SRCREV_meta ?= "13dbce30d6a647228bf5a9483a9b9c2da1514f78"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"

Signature · 1 line

1.7.4.1

Bruce Ashfield

author

2011-08-24 20:55 UTC #4 lore raw

PATCH 4/4 linux-yocto/2.6.37: apmd + get time of day fixes

In reply to Bruce Ashfield

Fixes [YOCTO #916]
Fixes [YOCTO #900]

Merging:

[
commit 4ae8f8605c81c39b959948e23f7123294a5dfb3f
Author: Liming Wang <[email protected]>
Date: Wed Aug 24 10:45:19 2011 +0800

x86: use vdso gettime fallback versus returning an error

__vdso_clock_gettime should fall back to call vdso_fallback_gettime function if no clockid is selected, not just return error.

Signed-off-by Liming Wang <[email protected]

]
[
commit aeea99683c7283f1f3320bf2ee7085ee252d4e7e
Author: Liming Wang <[email protected]>
Date: Fri Aug 19 17:43:49 2011 +0800

meta: add APM Emulation option to beagleboard

apmd daemon needs this option to work, so add this to beagleboard kernel config file.

Signed-off-by Liming Wang <[email protected]>

]

Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/recipes-kernel/linux/linux-yocto_2.6.37.bb |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

meta/recipes-kernel/linux/linux-yocto_2.6.37.bb +6 -6

index 145abe1..4199137 100644
@@ -14,12 +14,12 @@ KMETA = meta
 LINUX_VERSION ?= "2.6.37"
 LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
 
-SRCREV_machine_qemuarm = "f5aaddc24d0866ac12e924c4cee1382cce4cdb44"
-SRCREV_machine_qemumips = "f988df822335de0e463056f8c43f2984c29e2bd1"
-SRCREV_machine_qemuppc = "b03682b7db2f21c7dcabbbe4073061b601ad5ee9"
-SRCREV_machine_qemux86 = "ff1a08b4f5a0c4afa04160460421d67f37299f2c"
-SRCREV_machine_qemux86-64 = "be49445d1504c3d4021c01471223208cd3cc9c4f"
-SRCREV_machine = "ffd73d6b2a9bfa0de5710b90a2237f4be66ae9a7"
+SRCREV_machine_qemuarm = "b3e53a090eaa23aa82e64fa0a563a93a2b4dbb5d"
+SRCREV_machine_qemumips = "91f2eb4a3b447476b36aac8e6e198d08c98e0680"
+SRCREV_machine_qemuppc = "862faf3666b3a4e4bc1d469ff5fb3fb90c25f621"
+SRCREV_machine_qemux86 = "27ad78e1f6378da554775a7d6760730c92f8c5a7"
+SRCREV_machine_qemux86-64 = "af2bfbe5f757361b5b027a24d67a93bfdfaaf33c"
+SRCREV_machine = "4ae8f8605c81c39b959948e23f7123294a5dfb3f"
 SRCREV_meta = "aeea99683c7283f1f3320bf2ee7085ee252d4e7e"
 
 PR = "r20"

Signature · 1 line

1.7.4.1

Bruce Ashfield

2011-08-24 21:01 UTC #5 lore raw

In reply to Bruce Ashfield

Quoted 17 lines · Bruce Ashfield

Richard/Saul,
Here's a consolidated kernel pull request that fixes a series of bugs that have been around for a while and fixes some of the remaining issues from the -rt work that completed last week.
Darren: I also updated the -rt source revs and recipe with some streamlining that builds on top of changse that merged last week.
The patches have the details of the bugs and fixes.
cc Darren Hart <[email protected]>
The following changes since commit f852199ff598069bbecad4146f13377753df1648:
linux-yocto: update meta SRCREVs for beagleboard config changes (2011-08-24 16:29:22 -0400)

Quoted 7 lines

are available in the git repository at:
git://git.pokylinux.org/poky-contrib kernel-oe
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-oe
Bruce Ashfield (4):
kern-tools: allow flexible branch points
linux-yocto-rt: update qemuppc support and streamline variables

This patch doesn't seem to have looped around ... If it hasn't arrived by tonight, I can
resend.

Cheers,

Bruce

Quoted 18 lines

linux-yocto: update machines and default configuration linux-yocto/2.6.37: apmd + get time of day fixes
.../kern-tools/kern-tools-native_git.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 11 ++++------- meta/recipes-kernel/linux/linux-yocto_2.6.37.bb | 12 ++++++------ meta/recipes-kernel/linux/linux-yocto_3.0.bb | 14 +++++++-------
 4 files changed, 18 insertions(+), 21 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"

Richard Purdie

2011-08-24 23:13 UTC #6 lore raw

In reply to Bruce Ashfield

Hi Bruce,

Quoted 19 lines · Bruce Ashfield

Here's a consolidated kernel pull request that fixes a series of bugs that have been around for a while and fixes some of the remaining issues from the -rt work that completed last week.
Darren: I also updated the -rt source revs and recipe with some streamlining that builds on top of changse that merged last week.
The patches have the details of the bugs and fixes.
cc Darren Hart <[email protected]>
The following changes since commit f852199ff598069bbecad4146f13377753df1648:
linux-yocto: update meta SRCREVs for beagleboard config changes (2011-08-24 16:29:22 -0400)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib kernel-oe
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-oe

Quoted 5 lines

Bruce Ashfield (4):
kern-tools: allow flexible branch points
linux-yocto-rt: update qemuppc support and streamline variables
linux-yocto: update machines and default configuration linux-yocto/2.6.37: apmd + get time of day fixes

I took the first two of these. The other two didn't apply and I didn't feel happy taking them. I tried to look at the git tree above and I couldn't see the patches there...

Cheers,

Richard

Bruce Ashfield

2011-08-24 23:25 UTC #7 lore raw

Quoted 28 lines · Richard Purdie

Hi Bruce,
Quoted 19 lines · Bruce Ashfield
Here's a consolidated kernel pull request that fixes a series of bugs that have been around for a while and fixes some of the remaining issues from the -rt work that completed last week.
Darren: I also updated the -rt source revs and recipe with some streamlining that builds on top of changse that merged last week.
The patches have the details of the bugs and fixes.
cc Darren Hart <[email protected]>
The following changes since commit f852199ff598069bbecad4146f13377753df1648:
linux-yocto: update meta SRCREVs for beagleboard config changes (2011-08-24 16:29:22 -0400)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib kernel-oe
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-oe
Quoted 5 lines
Bruce Ashfield (4):
kern-tools: allow flexible branch points
linux-yocto-rt: update qemuppc support and streamline variables
linux-yocto: update machines and default configuration linux-yocto/2.6.37: apmd + get time of day fixes

Quoted 3 lines

I took the first two of these. The other two didn't apply and I didn't feel happy taking them. I tried to look at the git tree above and I couldn't see the patches there...

Really ? That strange .. how could they not apply, they were stacked and pushed on top of an up to date master. Which part rejected ?

I'll re-push and see what's up.

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"

Bruce Ashfield

2011-08-24 23:33 UTC #8 lore raw

Quoted 30 lines · Bruce Ashfield

Quoted 28 lines · Richard Purdie
Hi Bruce,
Quoted 24 lines · Bruce Ashfield
Here's a consolidated kernel pull request that fixes a series of bugs that have been around for a while and fixes some of the remaining issues from the -rt work that completed last week.
Darren: I also updated the -rt source revs and recipe with some streamlining that builds on top of changse that merged last week.
The patches have the details of the bugs and fixes.
cc Darren Hart <[email protected]>
The following changes since commit f852199ff598069bbecad4146f13377753df1648:
linux-yocto: update meta SRCREVs for beagleboard config changes (2011-08-24 16:29:22 -0400)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib kernel-oe
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-oe
Bruce Ashfield (4):
kern-tools: allow flexible branch points
linux-yocto-rt: update qemuppc support and streamline variables
linux-yocto: update machines and default configuration linux-yocto/2.6.37: apmd + get time of day fixes

Quoted 8 lines

Quoted 3 lines
I took the first two of these. The other two didn't apply and I didn't feel happy taking them. I tried to look at the git tree above and I couldn't see the patches there...
Really ? That strange .. how could they not apply, they were stacked and pushed on top of an up to date master. Which part rejected ?
I'll re-push and see what's up.

Heh. Operator error. I did this:

git push ssh://[email protected]/poky-contrib kernel-oe:kernel-oe

and generated the pull request against zedd/kernel-oe, which is largely fine, but
I had one more patch in the stack.

I've now pushed to zedd/kernel-oe and everything is there. Let me know if you want anything resent.

The following changes since commit f8cddd74574756174a82c856cecdeb6f83b9dea5:

mpc8315e-rdb: add kernel modules to rootfs (2011-08-23 20:45:07 -0700)

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

Bruce Ashfield (5):
linux-yocto: update meta SRCREVs for beagleboard config changes
kern-tools: allow flexible branch points
linux-yocto-rt: update qemuppc support and streamline variables
linux-yocto: update machines and default configuration linux-yocto/2.6.37: apmd + get time of day fixes

 .../kern-tools/kern-tools-native_git.bb            |    2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb    |   11 ++++-------
 meta/recipes-kernel/linux/linux-yocto_2.6.37.bb    |   14 +++++++-------
 meta/recipes-kernel/linux/linux-yocto_3.0.bb       |   14 +++++++-------
 4 files changed, 19 insertions(+), 22 deletions(-)

Bruce

Quoted 21 lines

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"

Richard Purdie

2011-08-25 01:21 UTC #9 lore raw

Quoted 60 lines · Bruce Ashfield

Quoted 30 lines · Bruce Ashfield
Quoted 28 lines · Richard Purdie
Hi Bruce,
Quoted 24 lines · Bruce Ashfield
Here's a consolidated kernel pull request that fixes a series of bugs that have been around for a while and fixes some of the remaining issues from the -rt work that completed last week.
Darren: I also updated the -rt source revs and recipe with some streamlining that builds on top of changse that merged last week.
The patches have the details of the bugs and fixes.
cc Darren Hart <[email protected]>
The following changes since commit f852199ff598069bbecad4146f13377753df1648:
linux-yocto: update meta SRCREVs for beagleboard config changes (2011-08-24 16:29:22 -0400)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib kernel-oe
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-oe
Bruce Ashfield (4):
kern-tools: allow flexible branch points
linux-yocto-rt: update qemuppc support and streamline variables
linux-yocto: update machines and default configuration linux-yocto/2.6.37: apmd + get time of day fixes
Quoted 8 lines
Quoted 3 lines
I took the first two of these. The other two didn't apply and I didn't feel happy taking them. I tried to look at the git tree above and I couldn't see the patches there...
Really ? That strange .. how could they not apply, they were stacked and pushed on top of an up to date master. Which part rejected ?
I'll re-push and see what's up.
Heh. Operator error. I did this:
git push ssh://[email protected]/poky-contrib kernel-oe:kernel-oe
and generated the pull request against zedd/kernel-oe, which is largely fine, but
I had one more patch in the stack.
I've now pushed to zedd/kernel-oe and everything is there. Let me know if you want anything resent.
The following changes since commit f8cddd74574756174a82c856cecdeb6f83b9dea5:
mpc8315e-rdb: add kernel modules to rootfs (2011-08-23 20:45:07 -0700)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib kernel-oe
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-oe

Quoted 6 lines

Bruce Ashfield (5):
linux-yocto: update meta SRCREVs for beagleboard config changes
kern-tools: allow flexible branch points
linux-yocto-rt: update qemuppc support and streamline variables
linux-yocto: update machines and default configuration linux-yocto/2.6.37: apmd + get time of day fixes

Thanks, merged to master :)

Cheers,

Richard