* [PATCH 0/1] linux-yocto/meta: fix SRCREV
@ 2011-03-28 17:31 Bruce Ashfield
2011-03-28 17:31 ` [PATCH 1/1] " Bruce Ashfield
2011-03-28 19:12 ` [PATCH 0/1] " Richard Purdie
0 siblings, 2 replies; 3+ messages in thread
From: Bruce Ashfield @ 2011-03-28 17:31 UTC (permalink / raw)
To: richard.purdie; +Cc: poky, openembedded-core
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 <bruce.ashfield@windriver.com>
---
Bruce Ashfield (1):
linux-yocto/meta: fix SRCREV
.../conf/distro/include/poky-default-revisions.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH 1/1] linux-yocto/meta: fix SRCREV
2011-03-28 17:31 [PATCH 0/1] linux-yocto/meta: fix SRCREV Bruce Ashfield
@ 2011-03-28 17:31 ` Bruce Ashfield
2011-03-28 19:12 ` [PATCH 0/1] " Richard Purdie
1 sibling, 0 replies; 3+ messages in thread
From: Bruce Ashfield @ 2011-03-28 17:31 UTC (permalink / raw)
To: richard.purdie; +Cc: poky, openembedded-core
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(-)
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"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 0/1] linux-yocto/meta: fix SRCREV
2011-03-28 17:31 [PATCH 0/1] linux-yocto/meta: fix SRCREV Bruce Ashfield
2011-03-28 17:31 ` [PATCH 1/1] " Bruce Ashfield
@ 2011-03-28 19:12 ` Richard Purdie
1 sibling, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2011-03-28 19:12 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: poky, openembedded-core
On Mon, 2011-03-28 at 13:31 -0400, Bruce Ashfield wrote:
> 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 <bruce.ashfield@windriver.com>
> ---
>
>
> Bruce Ashfield (1):
> linux-yocto/meta: fix SRCREV
Merged to master, thanks.
Cheers,
Richard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-03-28 19:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-28 17:31 [PATCH 0/1] linux-yocto/meta: fix SRCREV Bruce Ashfield
2011-03-28 17:31 ` [PATCH 1/1] " Bruce Ashfield
2011-03-28 19:12 ` [PATCH 0/1] " Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox