summaryrefslogtreecommitdiff
path: root/meta/conf
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2011-03-28 11:32:15 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-28 20:08:08 +0100
commit594d43d91c7a604325a6100a48f76682c9218ff4 (patch)
tree45a8a3e5c78998c056dad98fe190098fe416aa41 /meta/conf
parent18124c5065fc570e672d068e915e0f476d20379c (diff)
downloadopenembedded-core-594d43d91c7a604325a6100a48f76682c9218ff4.tar.gz
openembedded-core-594d43d91c7a604325a6100a48f76682c9218ff4.tar.bz2
openembedded-core-594d43d91c7a604325a6100a48f76682c9218ff4.tar.xz
openembedded-core-594d43d91c7a604325a6100a48f76682c9218ff4.zip
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. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc2
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 6ec74baa1..d195a9d69 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"