[PATCH 0/1 master/for-danny] kernel-yocto: validate branches fix

[PATCH 0/1 master/for-danny] kernel-yocto: validate branches fix

[Bruce Ashfield]

Richard/Saul/Ross,

This is a fix for YOCTO #3478, and it fixes a problem that was
being seen when BSPs created by yocto-bsp. It turned out to be
triggered by meta branch SRCREVs that triggered a branch reset,
which then prevented the tools from doing the rest of their job.

The fix is both for master and for danny, I've tested it, TomZ
has tested it, and so has the bug submitter, we are all happy 
with the results.

Cheers,

Bruce


The following changes since commit 247b6a3754c2c50318e2a73d79981ba0e9cb560b:

  gstreamer, gst-plugins*: fix localdata (2012-11-28 15:25:33 +0000)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib zedd/kernel-fixes
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-fixes

Bruce Ashfield (1):
  kernel-yocto: checkout known branch before leaving
    do_validate_branches

 meta/classes/kernel-yocto.bbclass |    2 ++
 1 file changed, 2 insertions(+)

-- 
1.7.10.4

[PATCH 1/1] kernel-yocto: checkout known branch before leaving do_validate_branches

[Bruce Ashfield]

We should always leave the tree on a BSP branch or master when
do_validate_branches completes to avoid modifying version tracked
files are part of the build process. Modifying these files will lead
to errors when changing branches, since the contents would be lost.

This is evident in the case that a the meta branch is reset to a
known SRCREV and the tree was left on the meta branch. This branch
tracks the meta/meta-series, and other artifacts of the original
tree construction. When the build process runs, it updates these same
files, which creates a conflict when switching branches.

This has been fixed in the tree construction scripts to not track
these files, but a secondary fix is also required of not leaving
the build on these branches, to allow arbitrary trees to be built.

[YOCTO #3413]

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/classes/kernel-yocto.bbclass |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 0d4ed21..c74317e 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -327,6 +327,8 @@ do_validate_branches() {
 	if [ $? -eq 0 ]; then
 		# restore the branch for builds
 		git checkout -q -f ${KBRANCH}
+        else
+	        git checkout -q master
 	fi
 }
 
-- 
1.7.10.4

Re: [PATCH 0/1 master/for-danny] kernel-yocto: validate branches fix

[Burton, Ross]

On 29 November 2012 18:42, Bruce Ashfield <bruce.ashfield@windriver.com> wrote:
> Richard/Saul/Ross,
>
> This is a fix for YOCTO #3478, and it fixes a problem that was
> being seen when BSPs created by yocto-bsp. It turned out to be
> triggered by meta branch SRCREVs that triggered a branch reset,
> which then prevented the tools from doing the rest of their job.
>
> The fix is both for master and for danny, I've tested it, TomZ
> has tested it, and so has the bug submitter, we are all happy
> with the results.

Merged to danny-next.

Ross