bitbake: toaster: buildinfohelper local layer don't construct path using git info
When the layer is local source don't try and work out the location of the layer by using the git information (getGitCloneDirectory) [YOCTO #10199] (Bitbake rev: 3dfea5214d4bd006e26630e5024774ecb84ea527) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: bavery <brian.avery@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
6066729797
commit
a884c4307a
|
@ -451,7 +451,11 @@ class ORMWrapper(object):
|
|||
# note that this is different
|
||||
buildrequest = BuildRequest.objects.get(pk = br_id)
|
||||
for brl in buildrequest.brlayer_set.all():
|
||||
localdirname = os.path.join(bc.getGitCloneDirectory(brl.giturl, brl.commit), brl.dirpath)
|
||||
if brl.local_source_dir:
|
||||
localdirname = os.path.join(brl.local_source_dir,
|
||||
brl.dirpath)
|
||||
else:
|
||||
localdirname = os.path.join(bc.getGitCloneDirectory(brl.giturl, brl.commit), brl.dirpath)
|
||||
# we get a relative path, unless running in HEAD mode where the path is absolute
|
||||
if not localdirname.startswith("/"):
|
||||
localdirname = os.path.join(bc.be.sourcedir, localdirname)
|
||||
|
@ -981,8 +985,6 @@ class BuildInfoHelper(object):
|
|||
def _get_layer_version_for_path(self, path):
|
||||
self._ensure_build()
|
||||
|
||||
assert path.startswith("/")
|
||||
|
||||
def _slkey_interactive(layer_version):
|
||||
assert isinstance(layer_version, Layer_Version)
|
||||
return len(layer_version.local_path)
|
||||
|
|
Loading…
Reference in New Issue