Skip to contentSkip to conversation

linux-yocto/meta: fix SRCREV

PATCH Applied Bruce Ashfield 2 participants 3 messages Mar 28, 2011

lore
Share & tools
lore
#0 lore raw

cover linux-yocto/meta: fix SRCREV

The SRCREV that was pushed to meta isn't even a commit Id on the meta branch. As a result, the recovery code for bad SRCREV can't trigger and fix things up due to conflicting files between the branches.

Updating to the right SRCREV fixes the problem.

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

Thanks,
Bruce Ashfield <[email protected]>
---

Bruce Ashfield (1):
linux-yocto/meta: fix SRCREV

 .../conf/distro/include/poky-default-revisions.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
#1 lore raw

PATCH 1/1 linux-yocto/meta: fix SRCREV

The SRCREV that was pushed to meta isn't even a commit Id on the meta branch. As a result, the recovery code for bad SRCREV can't trigger and fix things up due to conflicting files between the branches.

Updating to the right SRCEV fixes the problem.

---
 .../conf/distro/include/poky-default-revisions.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/conf/distro/include/poky-default-revisions.inc +1 -1
index 6ec74ba..d195a9d 100644
@@ -109,7 +109,7 @@ SRCREV_machine_pn-linux-yocto_routerstationpro ?= "78214d7ac1c3103840fe69d3bbbf8
 SRCREV_machine_pn-linux-yocto_mpc8315e-rdb ?= "f700964852b98d6e5c7f5da24ade0256f97cd8cb"
 SRCREV_machine_pn-linux-yocto_beagleboard ?= "17e49db8624324d090dd5aaa18ef977bb2dd5f6d"
 SRCREV_machine_pn-linux-yocto ?= "2b2ef940457f0bb40e0fb76937c921c2962364ca"
-SRCREV_meta_pn-linux-yocto ?= "17e49db8624324d090dd5aaa18ef977bb2dd5f6d"
+SRCREV_meta_pn-linux-yocto ?= "212cae404e57ff9dc58c808035770d51325c3512"
 SRCREV_pn-linux-libc-headers-yocto ??= "17e49db8624324d090dd5aaa18ef977bb2dd5f6d"
 SRCREV_pn-matchbox-config-gtk ??= "3ed74dfb7c57be088a5ab36e446c0ccde9fa1028"
 SRCREV_pn-matchbox-desktop-sato ??= "76"
Signature · 1 line
1.7.0.4
#2 lore raw
In reply to Bruce Ashfield
Quoted 11 lines · Bruce Ashfield

The SRCREV that was pushed to meta isn't even a commit Id on the meta branch. As a result, the recovery code for bad SRCREV can't trigger and fix things up due to conflicting files between the branches.

Updating to the right SRCREV fixes the problem.

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

Quoted 7 lines

Thanks,
Bruce Ashfield <[email protected]>
---

Bruce Ashfield (1):
linux-yocto/meta: fix SRCREV

Merged to master, thanks.

Cheers,

Richard