mirror of
https://git.yoctoproject.org/poky
synced 2026-09-19 09:49:33 +02:00
bitbake: toaster: localhostbectrl Pass DATABASE_URL in via the process environment
Instead of putting the DATABASE_URL as part of the command for launching the bitbake observer process set it as part of environment. This fixes two issues 1. Where the value isn't quoted and therefore will be interpreted in the shell and 2. Anyone being able to see the value of DATABASE_URL in the process tree. [YOCTO #8669] (Bitbake rev: 832a8523067606b180c02f0d1544e8a23219bb08) 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:
Elliot Smith
committed by
Richard Purdie
Richard Purdie
parent
4677d8b4fb
commit
9d8e36a6c9
@@ -3,15 +3,15 @@
|
||||
{% load projecttags %}
|
||||
{% load project_url_tag %}
|
||||
<html lang="en">
|
||||
<head>
|
||||
<title>
|
||||
{% block title %} Toaster {% endblock %}
|
||||
</title>
|
||||
<link rel="stylesheet" href="{% static 'css/bootstrap.min.css' %}" type="text/css"/>
|
||||
<link rel="stylesheet" href="{% static 'css/bootstrap-responsive.min.css' %}" type='text/css'/>
|
||||
<link rel="stylesheet" href="{% static 'css/font-awesome.min.css' %}" type='text/css'/>
|
||||
<link rel="stylesheet" href="{% static 'css/prettify.css' %}" type='text/css'/>
|
||||
<link rel="stylesheet" href="{% static 'css/default.css' %}" type='text/css'/>
|
||||
<head>
|
||||
<title>
|
||||
{% block title %} Toaster {% endblock %}
|
||||
</title>
|
||||
<link rel="stylesheet" href="{% static 'css/bootstrap.min.css' %}" type="text/css"/>
|
||||
<link rel="stylesheet" href="{% static 'css/bootstrap-responsive.min.css' %}" type='text/css'/>
|
||||
<link rel="stylesheet" href="{% static 'css/font-awesome.min.css' %}" type='text/css'/>
|
||||
<link rel="stylesheet" href="{% static 'css/prettify.css' %}" type='text/css'/>
|
||||
<link rel="stylesheet" href="{% static 'css/default.css' %}" type='text/css'/>
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
|
||||
@@ -40,7 +40,6 @@
|
||||
projectId : {{project.id}},
|
||||
projectPageUrl : {% url 'project' project.id as purl %}{{purl|json}},
|
||||
projectName : {{project.name|json}},
|
||||
projectIsDefault: {% if project.is_default %}true{% else %}false{% endif %},
|
||||
recipesTypeAheadUrl: {% url 'xhr_recipestypeahead' project.id as paturl%}{{paturl|json}},
|
||||
layersTypeAheadUrl: {% url 'xhr_layerstypeahead' project.id as paturl%}{{paturl|json}},
|
||||
machinesTypeAheadUrl: {% url 'xhr_machinestypeahead' project.id as paturl%}{{paturl|json}},
|
||||
@@ -51,37 +50,24 @@
|
||||
projectId : undefined,
|
||||
projectPageUrl : undefined,
|
||||
projectName : undefined,
|
||||
projectIsDefault: false,
|
||||
{% endif %}
|
||||
};
|
||||
</script>
|
||||
<script src="{% static 'js/base.js' %}"></script>
|
||||
<script>
|
||||
$(document).ready(function () {
|
||||
/* Vars needed for base.js */
|
||||
var ctx = {};
|
||||
ctx.numProjects = {{projects|length}};
|
||||
ctx.currentUrl = "{{request.path|escapejs}}";
|
||||
{% block extraheadcontent %}
|
||||
{% endblock %}
|
||||
</head>
|
||||
|
||||
basePageInit(ctx);
|
||||
});
|
||||
</script>
|
||||
<body style="height: 100%">
|
||||
|
||||
{% block extraheadcontent %}
|
||||
{% endblock %}
|
||||
</head>
|
||||
{% csrf_token %}
|
||||
<div id="loading-notification" class="alert lead text-center" style="display:none">
|
||||
Loading <i class="fa-pulse icon-spinner"></i>
|
||||
</div>
|
||||
|
||||
<body style="height: 100%">
|
||||
|
||||
{% csrf_token %}
|
||||
<div id="loading-notification" class="alert lead text-center" style="display:none">
|
||||
Loading <i class="fa-pulse icon-spinner"></i>
|
||||
</div>
|
||||
|
||||
<div id="change-notification" class="alert lead alert-info" style="display:none">
|
||||
<button type="button" class="close" id="hide-alert">×</button>
|
||||
<span id="change-notification-msg"></span>
|
||||
</div>
|
||||
<div id="change-notification" class="alert lead alert-info" style="display:none">
|
||||
<button type="button" class="close" id="hide-alert">×</button>
|
||||
<span id="change-notification-msg"></span>
|
||||
</div>
|
||||
|
||||
<div class="navbar navbar-fixed-top">
|
||||
<div class="navbar-inner">
|
||||
@@ -125,72 +111,19 @@
|
||||
|
||||
<!-- new project button; only show in build mode -->
|
||||
{% if BUILD_MODE %}
|
||||
<div class="btn-group pull-right">
|
||||
<a class="btn" id="new-project-button" href="{% url 'newproject' %}">New project</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<!--
|
||||
New build popover; only shown if there is at least one user-created project
|
||||
and we're in build mode
|
||||
-->
|
||||
{% if BUILD_MODE and non_cli_projects.count > 0 %}
|
||||
<div class="btn-group pull-right" id="new-build-button" style="display:none">
|
||||
<button class="btn dropdown-toggle" data-toggle="dropdown">
|
||||
New build
|
||||
<i class="icon-caret-down"></i>
|
||||
</button>
|
||||
<ul class="dropdown-menu new-build multi-select">
|
||||
<li>
|
||||
<h3>New build</h3>
|
||||
<h6>
|
||||
Project:
|
||||
<span id="project">
|
||||
{% if project.id and not project.is_default %}
|
||||
<a class="lead" href="{% project_url project %}">{{project.name}}</a>
|
||||
{% else %}
|
||||
<a class="lead" href="#"></a>
|
||||
{% endif %}
|
||||
<i class="icon-pencil"></i>
|
||||
</span>
|
||||
</h6>
|
||||
<form id="change-project-form" style="display:none;">
|
||||
<div class="input-append">
|
||||
<input type="text" class="input-medium" id="project-name-input" placeholder="Type a project name" autocomplete="off" data-minLength="1" data-autocomplete="off" data-provide="typeahead"/>
|
||||
<button id="save-project-button" class="btn" type="button">Save</button>
|
||||
<a href="#" id="cancel-change-project" class="btn btn-link" style="display: none">Cancel</a>
|
||||
</div>
|
||||
<p><a id="view-all-projects" href="{% url 'all-projects' %}">View all projects</a></p>
|
||||
</form>
|
||||
</li>
|
||||
<li>
|
||||
<div class="alert" style="display:none;">
|
||||
<p>This project configuration is incomplete, so you cannot run builds.</p>
|
||||
<p><a href="{% if project.id %}{% url 'project' project.id %}{% endif %}">View project configuration</a></p>
|
||||
</div>
|
||||
</li>
|
||||
<li id="targets-form">
|
||||
<h6>Recipe(s):</h6>
|
||||
<form>
|
||||
<input type="text" class="input-xlarge build-target-input" placeholder="Type a recipe name" autocomplete="off" data-minLength="1" data-autocomplete="off" data-provide="typeahead" disabled/>
|
||||
<div class="row-fluid">
|
||||
<button class="btn btn-primary build-button" disabled>Build</button>
|
||||
</div>
|
||||
</form>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="btn-group pull-right">
|
||||
<a class="btn" id="new-project-button" href="{% url 'newproject' %}">New project</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="container-fluid top-padded">
|
||||
<div class="row-fluid">
|
||||
{% block pagecontent %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
<div class="container-fluid top-padded">
|
||||
<div class="row-fluid">
|
||||
{% block pagecontent %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user