Patchwork [1/1] linux-yocto/meta: fix SRCREV

login
register
mail settings
Submitter Bruce Ashfield
Date March 28, 2011, 5:31 p.m.
Message ID <4291f28327101ce51565d8b81558d0484914f8ab.1301333355.git.bruce.ashfield@windriver.com>
Download mbox | patch
Permalink /patch/1839/
State New, archived
Headers show

Comments

Bruce Ashfield - March 28, 2011, 5:31 p.m.
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.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../conf/distro/include/poky-default-revisions.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index 6ec74ba..d195a9d 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -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"