Skip to contentSkip to conversation

linux-yocto/meta-yocto: update hardware reference SRCREVs

PATCH Applied Bruce Ashfield 2 participants 3 messages Apr 13, 2012

lore
Share & tools
lore
#0 lore raw

cover linux-yocto/meta-yocto: update hardware reference SRCREVs

Richard/Saul,

When I bumped the reference boards to v3.0.34 a merge commit was missed. This wasn't immediately visible since for most boards, it didn't matter, and for the one that it did .. the board built fine:

Here's the patch commit header repeated:

[
commit 8cd31f9b0 linux-yocto/meta-yocto: update hardware reference boards to v3.0.24

Missed a merge commit on the hardware reference BSP branches.

As a result, validate_branches is adjusting the tree to build the proper SRCREV. For machines with board specific commits this means that some of their commits are missing, which leads to boot failure.

Bumping the SRCREVs fixes the problem
]

Fixes [YOCTO: #2292]

Cheers,

Bruce

The following changes since commit 04b16f1038f7cae445d741e86c2cc19c70f991c1:

rpm-native: Compile python rpm module (with-python) (2012-04-13 16:04:12 +0100)

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

Bruce Ashfield (1):
linux-yocto/meta-yocto: update hardware reference SRCREVs

 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
Signature · 1 line
1.7.5.4
#1 lore raw

PATCH 1/1 linux-yocto/meta-yocto: update hardware reference SRCREVs

commit 8cd31f9b0 linux-yocto/meta-yocto: update hardware reference boards to v3.0.24

Missed a merge commit on the hardware reference BSP branches.

As a result, validate_branches is adjusting the tree to build the proper SRCREV. For machines with board specific commits this means that some of their commits are missing, which leads to boot failure.

Bumping the SRCREVs fixes the problem

Fixes [YOCTO: #2292]

---
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend +4 -4
index 5277a69..944f601 100644
@@ -4,10 +4,10 @@ KMACHINE_mpc8315e-rdb = "yocto/standard/fsl-mpc8315e-rdb"
 KMACHINE_beagleboard = "yocto/standard/beagleboard"
 
 
-SRCREV_machine_atom-pc ?= "12b4af6966843baf7bb3aedbae93e69ae19405b0"
-SRCREV_machine_routerstationpro ?= "12b4af6966843baf7bb3aedbae93e69ae19405b0"
-SRCREV_machine_mpc8315e-rdb ?= "12b4af6966843baf7bb3aedbae93e69ae19405b0"
-SRCREV_machine_beagleboard ?= "12b4af6966843baf7bb3aedbae93e69ae19405b0"
+SRCREV_machine_atom-pc ?= "afdda882f902dd28693cd8701a7d497958290f09"
+SRCREV_machine_routerstationpro ?= "982522e3901fad56bb908565b22c498025ab536c"
+SRCREV_machine_mpc8315e-rdb ?= "83f422f718cf15633cb4c2d309aa041c3c354f65"
+SRCREV_machine_beagleboard ?= "8fd5a8eb4067c7032389e82d54f0e54e1e27f78c"
 
 COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
 COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
Signature · 1 line
1.7.5.4
Applied
#2 lore raw
In reply to Bruce Ashfield
Quoted 35 lines · Bruce Ashfield

Richard/Saul,

When I bumped the reference boards to v3.0.34 a merge commit was missed. This wasn't immediately visible since for most boards, it didn't matter, and for the one that it did .. the board built fine:

Here's the patch commit header repeated:

[
commit 8cd31f9b0 linux-yocto/meta-yocto: update hardware reference boards to v3.0.24

Missed a merge commit on the hardware reference BSP branches.

As a result, validate_branches is adjusting the tree to build the proper SRCREV. For machines with board specific commits this means that some of their commits are missing, which leads to boot failure.

Bumping the SRCREVs fixes the problem
]

Fixes [YOCTO: #2292]

Cheers,

Bruce

The following changes since commit 04b16f1038f7cae445d741e86c2cc19c70f991c1:

   rpm-native: Compile python rpm module (with-python) (2012-04-13 16:04:12 +0100)

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

Quoted 6 lines

Bruce Ashfield (1):
linux-yocto/meta-yocto: update hardware reference SRCREVs

  .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)

Merged into Poky Master

Thanks
Sau!