bitbake: toaster: loadconf Partially add back some of the layerSource parsing
Partially add back a revised version of the layersource handling so that we can continue to support the old toasterconf.json and it's setup of the local project. (Bitbake rev: cc1a1bc2ea6ae058278d4ecf483f5ea00502c6cb) 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>
This commit is contained in:
parent
04d1ad5fe7
commit
729d9fcb54
|
@ -9,6 +9,20 @@ from .checksettings import DN
|
||||||
import logging
|
import logging
|
||||||
logger = logging.getLogger("toaster")
|
logger = logging.getLogger("toaster")
|
||||||
|
|
||||||
|
# Temporary old code to support old toasterconf.json
|
||||||
|
def _reduce_canon_path(path):
|
||||||
|
components = []
|
||||||
|
for c in path.split("/"):
|
||||||
|
if c == "..":
|
||||||
|
del components[-1]
|
||||||
|
elif c == ".":
|
||||||
|
pass
|
||||||
|
else:
|
||||||
|
components.append(c)
|
||||||
|
if len(components) < 2:
|
||||||
|
components.append('')
|
||||||
|
return "/".join(components)
|
||||||
|
# End temp code
|
||||||
|
|
||||||
class Command(BaseCommand):
|
class Command(BaseCommand):
|
||||||
help = "Loads a toasterconf.json file in the database"
|
help = "Loads a toasterconf.json file in the database"
|
||||||
|
@ -76,6 +90,74 @@ class Command(BaseCommand):
|
||||||
# find layers with the same name
|
# find layers with the same name
|
||||||
ReleaseDefaultLayer.objects.get_or_create( release = ro, layer_name = dli)
|
ReleaseDefaultLayer.objects.get_or_create( release = ro, layer_name = dli)
|
||||||
|
|
||||||
|
# NOTE Temporary old code to handle old toasterconf.json. All this to
|
||||||
|
# be removed after rewrite of config loading mechanism
|
||||||
|
for lsi in data['layersources']:
|
||||||
|
assert 'sourcetype' in lsi
|
||||||
|
assert 'apiurl' in lsi
|
||||||
|
assert 'name' in lsi
|
||||||
|
assert 'branches' in lsi
|
||||||
|
|
||||||
|
if "local" in lsi['sourcetype']:
|
||||||
|
ls = LayerSource.TYPE_LOCAL
|
||||||
|
else:
|
||||||
|
ls = LayerSource.TYPE_LAYERINDEX
|
||||||
|
|
||||||
|
layer_releases = []
|
||||||
|
for branchname in lsi['branches']:
|
||||||
|
try:
|
||||||
|
release = Release.objects.get(branch_name=branchname)
|
||||||
|
layer_releases.append(release)
|
||||||
|
except Release.DoesNotExist:
|
||||||
|
logger.error("Layer set for %s but no release matches this"
|
||||||
|
"in the config" % branchname)
|
||||||
|
|
||||||
|
apiurl = _reduce_canon_path(
|
||||||
|
os.path.join(DN(os.path.abspath(filepath)), lsi['apiurl']))
|
||||||
|
|
||||||
|
if 'layers' in lsi:
|
||||||
|
for layerinfo in lsi['layers']:
|
||||||
|
lo, created = Layer.objects.get_or_create(
|
||||||
|
name=layerinfo['name'],
|
||||||
|
vcs_url=layerinfo['vcs_url'],
|
||||||
|
)
|
||||||
|
if layerinfo['local_path'].startswith("/"):
|
||||||
|
lo.local_path = layerinfo['local_path']
|
||||||
|
else:
|
||||||
|
lo.local_path = _reduce_canon_path(
|
||||||
|
os.path.join(apiurl, layerinfo['local_path']))
|
||||||
|
|
||||||
|
if layerinfo['vcs_url'].startswith("remote:"):
|
||||||
|
lo.vcs_url = _read_git_url_from_local_repository(
|
||||||
|
layerinfo['vcs_url'])
|
||||||
|
if lo.vcs_url is None:
|
||||||
|
logger.error("The toaster config file references"
|
||||||
|
" the local git repo, but Toaster "
|
||||||
|
"cannot detect it.\nYour local "
|
||||||
|
"configuration for layer %s is "
|
||||||
|
"invalid. Make sure that the "
|
||||||
|
"toasterconf.json file is correct."
|
||||||
|
% layerinfo['name'])
|
||||||
|
|
||||||
|
if lo.vcs_url is None:
|
||||||
|
lo.vcs_url = layerinfo['vcs_url']
|
||||||
|
|
||||||
|
if 'layer_index_url' in layerinfo:
|
||||||
|
lo.layer_index_url = layerinfo['layer_index_url']
|
||||||
|
lo.save()
|
||||||
|
|
||||||
|
for release in layer_releases:
|
||||||
|
lvo, created = Layer_Version.objects.get_or_create(
|
||||||
|
layer_source=ls,
|
||||||
|
release=release,
|
||||||
|
commit=release.branch_name,
|
||||||
|
branch=release.branch_name,
|
||||||
|
layer=lo)
|
||||||
|
lvo.dirpath = layerinfo['dirpath']
|
||||||
|
lvo.save()
|
||||||
|
# END temporary code
|
||||||
|
|
||||||
|
|
||||||
# set default release
|
# set default release
|
||||||
if ToasterSetting.objects.filter(name = "DEFAULT_RELEASE").count() > 0:
|
if ToasterSetting.objects.filter(name = "DEFAULT_RELEASE").count() > 0:
|
||||||
ToasterSetting.objects.filter(name = "DEFAULT_RELEASE").update(value = data['defaultrelease'])
|
ToasterSetting.objects.filter(name = "DEFAULT_RELEASE").update(value = data['defaultrelease'])
|
||||||
|
@ -95,6 +177,3 @@ class Command(BaseCommand):
|
||||||
raise CommandError("Need a path to the toasterconf.json file")
|
raise CommandError("Need a path to the toasterconf.json file")
|
||||||
filepath = args[0]
|
filepath = args[0]
|
||||||
self._import_layer_config(filepath)
|
self._import_layer_config(filepath)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue