linux-yocto: consolidated pull request

PATCH New Bruce Ashfield 1 participant 4 messages Dec 3, 2012

lore

Share & tools

lore

Bruce Ashfield

author

2012-12-03 21:03 UTC #0 lore raw

cover linux-yocto: consolidated pull request

Richard/Saul,

Just clearing my queue of some recent changes.

- version bumps for v3.4.19, v3.4.20
- a change to make the fetch aware of the fact that the meta branch name can change
- emenlow BSP changes for a psb -> emgd switch

Sanity checks all pass on my local builds and boots.

Cheers,

Bruce

The following changes since commit da6c266b1184eed8b1bc851f24a9ee17ab56d562:

xserver-xorg: restore packaging for the DRI/DRI2/DBE extensions (2012-12-03 16:38:35 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib zedd/kernel
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (3):
linux-yocto/3.4: merge v3.4.19, v3.4.20 linux-yocto/3.4: emenlow: switch from psb to emgd graphics linux-yocto/3.4: inform the fetcher if the meta branch changes

 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb   |    8 ++++----
 meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb |    6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.4.bb      |   18 +++++++++---------
 3 files changed, 16 insertions(+), 16 deletions(-)

Signature · 1 line

1.7.10.4

Bruce Ashfield

author

2012-12-03 21:03 UTC #1 lore raw

PATCH 1/3 linux-yocto/3.4: merge v3.4.19, v3.4.20

Updating the linux-yocto-3.4 trees to incorporate both 3.4.19 and 3.4.20 from the kernel.org -stable team.

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

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb   |    8 ++++----
 meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb |    6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.4.bb      |   16 ++++++++--------
 3 files changed, 15 insertions(+), 15 deletions(-)

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

index e0800ff..d524120 100644
@@ -3,14 +3,14 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH = "standard/preempt-rt/base"
 KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
-LINUX_VERSION ?= "3.4.18"
+LINUX_VERSION ?= "3.4.20"
 LINUX_KERNEL_TYPE = "preempt-rt"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "2572b13999da8129c37eb2bf7e9a8fa68dc2a4bf"
-SRCREV_machine_qemuppc ?= "2004632314104d4f31bb1577e955da53796f517c"
-SRCREV_meta ?= "4e5f2b43acfbdb924edbdf42a816e3e2b15203b3"
+SRCREV_machine ?= "61a6e7a812b3b49988c4eb29a78c5db94d380197"
+SRCREV_machine_qemuppc ?= "0d29fe9056288412b8b538e48af3c78bac3494f1"
+SRCREV_meta ?= "8b0a93c0a224c9b91f90545b123b055b2e313bfc"
 
 PR = "${INC_PR}.0"
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb +3 -3

index ab214c8..d6fe8bb 100644
@@ -8,12 +8,12 @@ KBRANCH = "${KBRANCH_DEFAULT}"
 LINUX_KERNEL_TYPE = "tiny"
 KCONFIG_MODE = "--allnoconfig"
 
-LINUX_VERSION ?= "3.4.18"
+LINUX_VERSION ?= "3.4.20"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "f1c2320544eaffd6ecc7fcb8b18f8a0ed4ba2e14"
-SRCREV_meta ?= "4e5f2b43acfbdb924edbdf42a816e3e2b15203b3"
+SRCREV_machine ?= "b13bef6377719a488293af196236cc290566fad3"
+SRCREV_meta ?= "8b0a93c0a224c9b91f90545b123b055b2e313bfc"
 
 PR = "${INC_PR}.0"
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto_3.4.bb +8 -8

index bb3c860..814492d 100644
@@ -3,17 +3,17 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH_DEFAULT = "standard/base"
 KBRANCH = "${KBRANCH_DEFAULT}"
 
-SRCREV_machine_qemuarm ?= "e24986bf7398f5fb471173bda1d4f32008da101a"
-SRCREV_machine_qemumips  ?= "8835a2ba0d8e8f9bb5e2513d3568ae3970acefd5"
-SRCREV_machine_qemuppc ?= "ae8e2cd14e47bceb9c2bdcb927b3a0ea61f6c311"
-SRCREV_machine_qemux86 ?= "f1c2320544eaffd6ecc7fcb8b18f8a0ed4ba2e14"
-SRCREV_machine_qemux86-64 ?= "f1c2320544eaffd6ecc7fcb8b18f8a0ed4ba2e14"
-SRCREV_machine ?= "f1c2320544eaffd6ecc7fcb8b18f8a0ed4ba2e14"
-SRCREV_meta ?= "4e5f2b43acfbdb924edbdf42a816e3e2b15203b3"
+SRCREV_machine_qemuarm ?= "092d66e326abfda80c50dcf1869417d7420847f1"
+SRCREV_machine_qemumips  ?= "b258437665477f44a868c38c6c9cc5199db58cd8"
+SRCREV_machine_qemuppc ?= "67a370223d695ec08b6e5a38860fa1fe5d0d9f1e"
+SRCREV_machine_qemux86 ?= "b13bef6377719a488293af196236cc290566fad3"
+SRCREV_machine_qemux86-64 ?= "b13bef6377719a488293af196236cc290566fad3"
+SRCREV_machine ?= "b13bef6377719a488293af196236cc290566fad3"
+SRCREV_meta ?= "8b0a93c0a224c9b91f90545b123b055b2e313bfc"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
 
-LINUX_VERSION ?= "3.4.18"
+LINUX_VERSION ?= "3.4.20"
 
 PR = "${INC_PR}.3"
 PV = "${LINUX_VERSION}+git${SRCPV}"

Signature · 1 line

1.7.10.4

Bruce Ashfield

author

2012-12-03 21:03 UTC #2 lore raw

PATCH 2/3 linux-yocto/3.4: emenlow: switch from psb to emgd graphics

In reply to Bruce Ashfield

Updating the meta branch SRCREVs for the following commit:

[
meta/emenlow: use emgd instead of psb graphics driver

This commit essentially does just this:
Remove all the references of psb patches for emenlow BSP. Change the emenlow scc files to use emgd instead of psb.
]

Signed-off-by Nitin A Kamble <[email protected]>

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

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb   |    2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.4.bb      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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

index d524120..6412edc 100644
@@ -10,7 +10,7 @@ KMETA = "meta"
 
 SRCREV_machine ?= "61a6e7a812b3b49988c4eb29a78c5db94d380197"
 SRCREV_machine_qemuppc ?= "0d29fe9056288412b8b538e48af3c78bac3494f1"
-SRCREV_meta ?= "8b0a93c0a224c9b91f90545b123b055b2e313bfc"
+SRCREV_meta ?= "6737e890fff2a423fbb022ab1f7f82ef187fd8b1"
 
 PR = "${INC_PR}.0"
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb +1 -1

index d6fe8bb..a18a561 100644
@@ -13,7 +13,7 @@ LINUX_VERSION ?= "3.4.20"
 KMETA = "meta"
 
 SRCREV_machine ?= "b13bef6377719a488293af196236cc290566fad3"
-SRCREV_meta ?= "8b0a93c0a224c9b91f90545b123b055b2e313bfc"
+SRCREV_meta ?= "6737e890fff2a423fbb022ab1f7f82ef187fd8b1"
 
 PR = "${INC_PR}.0"
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto_3.4.bb +1 -1

index 814492d..0e795c6 100644
@@ -9,7 +9,7 @@ SRCREV_machine_qemuppc ?= "67a370223d695ec08b6e5a38860fa1fe5d0d9f1e"
 SRCREV_machine_qemux86 ?= "b13bef6377719a488293af196236cc290566fad3"
 SRCREV_machine_qemux86-64 ?= "b13bef6377719a488293af196236cc290566fad3"
 SRCREV_machine ?= "b13bef6377719a488293af196236cc290566fad3"
-SRCREV_meta ?= "8b0a93c0a224c9b91f90545b123b055b2e313bfc"
+SRCREV_meta ?= "6737e890fff2a423fbb022ab1f7f82ef187fd8b1"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"

Signature · 1 line

1.7.10.4

Bruce Ashfield

author

2012-12-03 21:03 UTC #3 lore raw

PATCH 3/3 linux-yocto/3.4: inform the fetcher if the meta branch changes

In reply to Bruce Ashfield

The meta data branch for the kernel can be varied by changing the KMETA variable, but that change wasn't reflected in the SRC_URI, which means that the fetcher won't check for changes on that branch and is a potential source of errors.

Making the meta branch specification KMETA vs meta solves the problem.

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

---
 meta/recipes-kernel/linux/linux-yocto_3.4.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta/recipes-kernel/linux/linux-yocto_3.4.bb +1 -1

index 0e795c6..91785f9 100644
@@ -11,7 +11,7 @@ SRCREV_machine_qemux86-64 ?= "b13bef6377719a488293af196236cc290566fad3"
 SRCREV_machine ?= "b13bef6377719a488293af196236cc290566fad3"
 SRCREV_meta ?= "6737e890fff2a423fbb022ab1f7f82ef187fd8b1"
 
-SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
+SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
 LINUX_VERSION ?= "3.4.20"

Signature · 1 line

1.7.10.4