summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSujith H <sujith.h@gmail.com>2016-07-20 08:58:57 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-11 00:09:29 +0100
commitef617e6f34cd3ad8cb455c9019d2025e5d09c61a (patch)
tree40bca483aa56aec120b9f754e35c8129f0a77459
parent8cad51965d07a6e395793224fa4103bc4bc2b967 (diff)
downloadpoky-ef617e6f34cd3ad8cb455c9019d2025e5d09c61a.tar.gz
bitbake: toaster: collect details for local dir imported from ui
Collect the dir path imported from UI and make sure that its getting added to bblayers.conf. This patch exactly does the same job. Any layer which is imported locally need not be cloned again to _toaster_clones dir. [YOCO #9911] (Bitbake rev: 5669157994fc220a018e37927600988f3fd43271) Signed-off-by: Sujith H <sujith.h@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/toaster/bldcontrol/localhostbecontroller.py13
1 files changed, 12 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
index 9364900b34..283e154530 100644
--- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -89,6 +89,10 @@ class LocalhostBEController(BuildEnvironmentController):
89 """ a word of attention: by convention, the first layer for any build will be poky! """ 89 """ a word of attention: by convention, the first layer for any build will be poky! """
90 90
91 assert self.be.sourcedir is not None 91 assert self.be.sourcedir is not None
92
93 layerlist = []
94 nongitlayerlist = []
95
92 # set layers in the layersource 96 # set layers in the layersource
93 97
94 # 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
@@ -102,6 +106,13 @@ class LocalhostBEController(BuildEnvironmentController):
102 # as it's generated by us layer on if needed 106 # as it's generated by us layer on if needed
103 if CustomImageRecipe.LAYER_NAME in layer.name: 107 if CustomImageRecipe.LAYER_NAME in layer.name:
104 continue 108 continue
109
110 # If we have local layers then we don't need clone them
111 # For local layers giturl will be empty
112 if not layer.giturl:
113 nongitlayerlist.append(layer.layer_version.layer.local_source_dir)
114 continue
115
105 if not (layer.giturl, layer.commit) in gitrepos: 116 if not (layer.giturl, layer.commit) in gitrepos:
106 gitrepos[(layer.giturl, layer.commit)] = [] 117 gitrepos[(layer.giturl, layer.commit)] = []
107 gitrepos[(layer.giturl, layer.commit)].append( (layer.name, layer.dirpath) ) 118 gitrepos[(layer.giturl, layer.commit)].append( (layer.name, layer.dirpath) )
@@ -131,7 +142,6 @@ class LocalhostBEController(BuildEnvironmentController):
131 142
132 logger.info("Using pre-checked out source for layer %s", cached_layers) 143 logger.info("Using pre-checked out source for layer %s", cached_layers)
133 144
134 layerlist = []
135 145
136 146
137 # 3. checkout the repositories 147 # 3. checkout the repositories
@@ -245,6 +255,7 @@ class LocalhostBEController(BuildEnvironmentController):
245 layerlist.append(layerpath) 255 layerlist.append(layerpath)
246 256
247 self.islayerset = True 257 self.islayerset = True
258 layerlist.extend(nongitlayerlist)
248 return layerlist 259 return layerlist
249 260
250 def readServerLogFile(self): 261 def readServerLogFile(self):