summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2016-03-23 08:28:38 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-23 17:53:55 +0000
commitb60c9943bff4448be5768e095b67bc4a291414ef (patch)
treee6459e0293a4013ff38e5d1f8d9ddea2576c71aa
parent302509214255f7a2b7226e5a6b8a2e361b826168 (diff)
downloadpoky-b60c9943bff4448be5768e095b67bc4a291414ef.tar.gz
bitbake: toaster: localhostbecontroller Allow file:/// uri type for git repo
We don't need to skip file:/// uri type locations for git repositories. If you're using a file:/// uri you should know that it has to be a local path. [YOCTO #9200] igned-off-by: Michael Wood <michael.g.wood@intel.com> (Bitbake rev: 4d0e5804103c2d98d038b3c490cac37a73f3cc47) Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/toaster/bldcontrol/localhostbecontroller.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
index 38e97a2e27..9deb572839 100644
--- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -128,8 +128,9 @@ class LocalhostBEController(BuildEnvironmentController):
128 gitrepos[(bitbake.giturl, bitbake.commit)].append( ("bitbake", bitbake.dirpath) ) 128 gitrepos[(bitbake.giturl, bitbake.commit)].append( ("bitbake", bitbake.dirpath) )
129 129
130 for layer in layers: 130 for layer in layers:
131 # we don't process local URLs 131 # We don't need to git clone the layer for the CustomImageRecipe
132 if layer.giturl.startswith("file://"): 132 # as it's generated by us layer on if needed
133 if CustomImageRecipe.LAYER_NAME in layer.name:
133 continue 134 continue
134 if not (layer.giturl, layer.commit) in gitrepos: 135 if not (layer.giturl, layer.commit) in gitrepos:
135 gitrepos[(layer.giturl, layer.commit)] = [] 136 gitrepos[(layer.giturl, layer.commit)] = []