]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
bitbake: toaster: localhostbecontroller Allow file:/// uri type for git repo
authorMichael Wood <michael.g.wood@intel.com>
Wed, 23 Mar 2016 08:28:38 +0000 (08:28 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 23 Mar 2016 17:53:55 +0000 (17:53 +0000)
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>
bitbake/lib/toaster/bldcontrol/localhostbecontroller.py

index 38e97a2e27643ac5daf70c02c61717a062c3deef..9deb57283971d785af4b68cbd718725b9cacdf23 100644 (file)
@@ -128,8 +128,9 @@ class LocalhostBEController(BuildEnvironmentController):
         gitrepos[(bitbake.giturl, bitbake.commit)].append( ("bitbake", bitbake.dirpath) )
 
         for layer in layers:
-            # we don't process local URLs
-            if layer.giturl.startswith("file://"):
+            # We don't need to git clone the layer for the CustomImageRecipe
+            # as it's generated by us layer on if needed
+            if CustomImageRecipe.LAYER_NAME in layer.name:
                 continue
             if not (layer.giturl, layer.commit) in gitrepos:
                 gitrepos[(layer.giturl, layer.commit)] = []