mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-07-27 07:27:12 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: toaster: display bitbake output after process start

Browse Source 
If the bitbake server exists after the initial process start,
the only output displayed shows proper server start, with
no debug info.

This patch also brings the server log into the error message,
so the user has better info about what's going on.

(Bitbake rev: 6b46f436296683f7a2f72ac978ef30d0a38ad7a4)

Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Belen Barros Pena
2015-03-12 11:30:43 +00:00
committed by Richard Purdie
parent 5b22f15557
commit ede212b2dd
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/toaster/orm/models.py
+7 -5
View File
@@ -52,7 +52,7 @@ class ToasterSetting(models.Model):
value = models.CharField(max_length=255)
def __unicode__(self):
return "Setting %s" % self.name
return "Setting %s = " % (self.name, self.value)
class ProjectManager(models.Manager):
def create_project(self, name, release):
@@ -100,7 +100,7 @@ class Project(models.Model):
objects = ProjectManager()
def __unicode__(self):
return "%s (%s, %s)" % (self.name, self.release, self.bitbake_version)
return "%s (Release %s, BBV %s)" % (self.name, self.release, self.bitbake_version)
def get_current_machine_name(self):
try:
@@ -896,7 +896,7 @@ class BitbakeVersion(models.Model):
dirpath = models.CharField(max_length=255)
def __unicode__(self):
return "%s (%s)" % (self.name, self.branch)
return "%s (Branch: %s)" % (self.name, self.branch)
class Release(models.Model):
@@ -1055,8 +1055,10 @@ class Layer_Version(models.Model):
# raise Exception(candidate_layer_versions)
release_priorities = map(lambda x: (x.layer_source_id, x.priority), project.release.releaselayersourcepriority_set.all().order_by("-priority"))
release_priorities = {}
for ls_id, prio in map(lambda x: (x.layer_source_id, x.priority), project.release.releaselayersourcepriority_set.all().order_by("-priority")):
release_priorities[ls_id] = prio
def _get_ls_priority(ls):
# if there is no layer source, we have minus infinite priority, as we don't want this layer selected
@@ -1081,7 +1083,7 @@ class Layer_Version(models.Model):
raise Exception("Cannot determine the vcs_reference for layer version %s" % vars(self))
def __unicode__(self):
return str(self.layer) + "(%s,%s)" % (self.get_vcs_reference(), self.build.project if self.build is not None else "None")
return "%d %s (VCS %s, Project %s)" % (self.pk, str(self.layer), self.get_vcs_reference(), self.build.project if self.build is not None else "No project")
class Meta:
unique_together = ("layer_source", "up_id")