diff options
author | David Reyna <David.Reyna@windriver.com> | 2014-03-07 21:58:29 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-11 12:24:32 -0700 |
commit | 7af7e852ea98fbd763108cea07e5ce5d14ffcde3 (patch) | |
tree | f77cf29b2f7fea93d35e03f43578aab52a547d4b /bitbake | |
parent | 324791a729d29b929dd2c78489f2564d5e01ad92 (diff) | |
download | poky-7af7e852ea98fbd763108cea07e5ce5d14ffcde3.tar.gz |
bitbake: toaster: add 'bblayers.conf' files to local config filter
In the variables table, add to the local configuration
filter the 'bblayers.conf' in addition to the 'local.conf'
files.
[YOCTO #5912]
(Bitbake rev: 3c41481fd00056712348d305d0246d84e9a2ff0a)
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/toaster/toastergui/views.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 6273d4c5ae..f8c8ccd406 100644 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
@@ -795,6 +795,8 @@ def configvars(request, build_id): | |||
795 | file_filter= search_term + ":" | 795 | file_filter= search_term + ":" |
796 | if filter_string.find('conf/local.conf') > 0: | 796 | if filter_string.find('conf/local.conf') > 0: |
797 | file_filter += 'conf/local.conf' | 797 | file_filter += 'conf/local.conf' |
798 | if filter_string.find('conf/bblayers.conf') > 0: | ||
799 | file_filter += 'conf/bblayers.conf' | ||
798 | if filter_string.find('conf/machine/') > 0: | 800 | if filter_string.find('conf/machine/') > 0: |
799 | file_filter += 'conf/machine/' | 801 | file_filter += 'conf/machine/' |
800 | if filter_string.find('conf/distro/') > 0: | 802 | if filter_string.find('conf/distro/') > 0: |
@@ -833,7 +835,7 @@ def configvars(request, build_id): | |||
833 | 'class' : 'vhistory__file_name', | 835 | 'class' : 'vhistory__file_name', |
834 | 'label': 'Show:', | 836 | 'label': 'Show:', |
835 | 'options' : [ | 837 | 'options' : [ |
836 | ('Local configuration variables', 'vhistory__file_name__contains:conf/local.conf'), | 838 | ('Local configuration variables', 'vhistory__file_name__regex:conf/(local|bblayers).conf'), |
837 | ('Machine configuration variables', 'vhistory__file_name__contains:conf/machine/'), | 839 | ('Machine configuration variables', 'vhistory__file_name__contains:conf/machine/'), |
838 | ('Distro configuration variables', 'vhistory__file_name__contains:conf/distro/'), | 840 | ('Distro configuration variables', 'vhistory__file_name__contains:conf/distro/'), |
839 | ('Layer configuration variables', 'vhistory__file_name__contains:conf/layer.conf'), | 841 | ('Layer configuration variables', 'vhistory__file_name__contains:conf/layer.conf'), |