diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2011-03-28 11:32:15 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-29 00:34:11 +0100 |
| commit | 9281315002e99420da81efc803874bfcddd99de4 (patch) | |
| tree | 5c6527c0992eaccd4949d44fa11ade3ee20d3efe /meta/conf | |
| parent | e41671ea1d2c9efabb4a577a0b69851558a15b5f (diff) | |
| download | poky-9281315002e99420da81efc803874bfcddd99de4.tar.gz | |
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.
(From OE-Core rev: 594d43d91c7a604325a6100a48f76682c9218ff4)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/distro/include/poky-default-revisions.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc index 6ec74baa12..d195a9d698 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 | |||
| 109 | SRCREV_machine_pn-linux-yocto_mpc8315e-rdb ?= "f700964852b98d6e5c7f5da24ade0256f97cd8cb" | 109 | SRCREV_machine_pn-linux-yocto_mpc8315e-rdb ?= "f700964852b98d6e5c7f5da24ade0256f97cd8cb" |
| 110 | SRCREV_machine_pn-linux-yocto_beagleboard ?= "17e49db8624324d090dd5aaa18ef977bb2dd5f6d" | 110 | SRCREV_machine_pn-linux-yocto_beagleboard ?= "17e49db8624324d090dd5aaa18ef977bb2dd5f6d" |
| 111 | SRCREV_machine_pn-linux-yocto ?= "2b2ef940457f0bb40e0fb76937c921c2962364ca" | 111 | SRCREV_machine_pn-linux-yocto ?= "2b2ef940457f0bb40e0fb76937c921c2962364ca" |
| 112 | SRCREV_meta_pn-linux-yocto ?= "17e49db8624324d090dd5aaa18ef977bb2dd5f6d" | 112 | SRCREV_meta_pn-linux-yocto ?= "212cae404e57ff9dc58c808035770d51325c3512" |
| 113 | SRCREV_pn-linux-libc-headers-yocto ??= "17e49db8624324d090dd5aaa18ef977bb2dd5f6d" | 113 | SRCREV_pn-linux-libc-headers-yocto ??= "17e49db8624324d090dd5aaa18ef977bb2dd5f6d" |
| 114 | SRCREV_pn-matchbox-config-gtk ??= "3ed74dfb7c57be088a5ab36e446c0ccde9fa1028" | 114 | SRCREV_pn-matchbox-config-gtk ??= "3ed74dfb7c57be088a5ab36e446c0ccde9fa1028" |
| 115 | SRCREV_pn-matchbox-desktop-sato ??= "76" | 115 | SRCREV_pn-matchbox-desktop-sato ??= "76" |