diff options
author | Michael Wood <michael.g.wood@intel.com> | 2016-08-22 16:42:32 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-02 18:09:50 +0100 |
commit | 3b87f2895add3944bffa430e209446defed57afa (patch) | |
tree | 61ec896a5586b87cffb374c51d567c5b953112c5 /bitbake/lib/toaster/bldcontrol | |
parent | 50a8d3a34ca89862b41fbe27f87bbe85a772db8b (diff) | |
download | poky-3b87f2895add3944bffa430e209446defed57afa.tar.gz |
bitbake: toaster: Fix oe-core fixture
Due to a copy paste error we managed to get some of the wrong
information in the oe fixture that provides a suggested default settings
for Toaster. This meant it tested correctly when it shouldn't have.
Fix:
- The use of local bitbake
- An incorrect call to realpath which didn't include its parent module.
- The field used for the local_dir of an existing openembedded-core
(Bitbake rev: d57a9124650e5367919668dfccf6aad4962a77f1)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/bldcontrol')
-rw-r--r-- | bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 10 | ||||
-rw-r--r-- | bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py index 283e154530..fbc5ee9d1d 100644 --- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | |||
@@ -98,8 +98,12 @@ class LocalhostBEController(BuildEnvironmentController): | |||
98 | # 1. get a list of repos with branches, and map dirpaths for each layer | 98 | # 1. get a list of repos with branches, and map dirpaths for each layer |
99 | gitrepos = {} | 99 | gitrepos = {} |
100 | 100 | ||
101 | gitrepos[(bitbake.giturl, bitbake.commit)] = [] | 101 | # if we're using a remotely fetched version of bitbake add its git |
102 | gitrepos[(bitbake.giturl, bitbake.commit)].append( ("bitbake", bitbake.dirpath) ) | 102 | # details to the list of repos to clone |
103 | if bitbake.giturl and bitbake.commit: | ||
104 | gitrepos[(bitbake.giturl, bitbake.commit)] = [] | ||
105 | gitrepos[(bitbake.giturl, bitbake.commit)].append( | ||
106 | ("bitbake", bitbake.dirpath)) | ||
103 | 107 | ||
104 | for layer in layers: | 108 | for layer in layers: |
105 | # We don't need to git clone the layer for the CustomImageRecipe | 109 | # We don't need to git clone the layer for the CustomImageRecipe |
@@ -142,8 +146,6 @@ class LocalhostBEController(BuildEnvironmentController): | |||
142 | 146 | ||
143 | logger.info("Using pre-checked out source for layer %s", cached_layers) | 147 | logger.info("Using pre-checked out source for layer %s", cached_layers) |
144 | 148 | ||
145 | |||
146 | |||
147 | # 3. checkout the repositories | 149 | # 3. checkout the repositories |
148 | for giturl, commit in gitrepos.keys(): | 150 | for giturl, commit in gitrepos.keys(): |
149 | localdirname = os.path.join(self.be.sourcedir, self.getGitCloneDirectory(giturl, commit)) | 151 | localdirname = os.path.join(self.be.sourcedir, self.getGitCloneDirectory(giturl, commit)) |
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py index 0dc55f63af..28b9945e8a 100644 --- a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py +++ b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py | |||
@@ -84,8 +84,9 @@ class Command(NoArgsCommand): | |||
84 | print("Loading OE-Core configuration") | 84 | print("Loading OE-Core configuration") |
85 | call_command("loaddata", "oe-core") | 85 | call_command("loaddata", "oe-core") |
86 | if template_conf: | 86 | if template_conf: |
87 | oe_core_path = os.realpath(template_conf + | 87 | oe_core_path = os.path.realpath( |
88 | "/../") | 88 | template_conf + |
89 | "/../") | ||
89 | else: | 90 | else: |
90 | print("TEMPLATECONF not found. You may have to" | 91 | print("TEMPLATECONF not found. You may have to" |
91 | " manually configure layer paths") | 92 | " manually configure layer paths") |
@@ -94,8 +95,9 @@ class Command(NoArgsCommand): | |||
94 | "layer: ") | 95 | "layer: ") |
95 | # Update the layer instances of openemebedded-core | 96 | # Update the layer instances of openemebedded-core |
96 | for layer in Layer.objects.filter( | 97 | for layer in Layer.objects.filter( |
97 | name="openembedded-core"): | 98 | name="openembedded-core", |
98 | layer.local_source_dir = oe_core_path | 99 | local_source_dir="OE-CORE-LAYER-DIR"): |
100 | layer.local_path = oe_core_path | ||
99 | layer.save() | 101 | layer.save() |
100 | 102 | ||
101 | # Import the custom fixture if it's present | 103 | # Import the custom fixture if it's present |