[Toaster] [PATCH] toaster: keep layer name in variable history path

[Reyna, David]

Hi all,

I have posted a patch for 8118 here:
  http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib?h=dreyna%2Fvarhist_layer_name_8188

The patch content is below.

I did a git send mail, but I have not seen it reflect yet from the Toaster email list.

- David


>From e281a3dc00ab531f6aef065bab81b4e66a8a5f63 Mon Sep 17 00:00:00 2001
From: David Reyna <David.Reyna at windriver.com>
Date: Fri, 26 Aug 2016 18:01:44 -0700
Subject: toaster: keep layer name in variable history path

When converting variable history file names to relative
paths, keep the layer directory's name so that the user
can distinguish between conf files with the same name.

[YOCTO #8188]

Signed-off-by: David Reyna <david.reyna at windriver.com>

diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py
index 0f09b5c..96166dc 100644
--- a/bitbake/lib/bb/ui/buildinfohelper.py
+++ b/bitbake/lib/bb/ui/buildinfohelper.py
@@ -1127,7 +1127,8 @@ class BuildInfoHelper(object):
                         abs_file_name = vh['file']
                         for pp in path_prefixes:
                             if abs_file_name.startswith(pp + "/"):
-                                vh['file']=abs_file_name[len(pp + "/"):]
+                                # preserve layer name in relative path
+                                vh['file']=abs_file_name[pp.rfind("/")+1:]
                                 break
         # save the variables
--
cgit v0.10.2

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.yoctoproject.org/pipermail/toaster/attachments/20160827/3dd7d8a3/attachment.html>