From 59561d652af91c2099b735084f0e44275d68e637 Mon Sep 17 00:00:00 2001 From: David Reyna Date: Mon, 5 Sep 2016 15:29:28 +0100 Subject: [PATCH] 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 Signed-off-by: Michael Wood Signed-off-by: Richard Purdie --- lib/bb/ui/buildinfohelper.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bb/ui/buildinfohelper.py b/lib/bb/ui/buildinfohelper.py index 0f09b5cb635..96166dc515d 100644 --- a/lib/bb/ui/buildinfohelper.py +++ b/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 -- 2.47.3