Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Paul Graydon
slapos
Commits
a37b9222
Commit
a37b9222
authored
Aug 30, 2018
by
Lorenzo Martinico
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Kill devserver after image has been built
parent
ada1d7b8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
software/nayuos/instance.cfg
software/nayuos/instance.cfg
+1
-1
software/nayuos/scripts/cros_full_build.in
software/nayuos/scripts/cros_full_build.in
+4
-0
software/nayuos/software.cfg
software/nayuos/software.cfg
+1
-1
No files found.
software/nayuos/instance.cfg
View file @
a37b9222
...
@@ -99,7 +99,7 @@ context =
...
@@ -99,7 +99,7 @@ context =
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
template = {{ software_dir }}/scripts/cros_full_build.in
template = {{ software_dir }}/scripts/cros_full_build.in
rendered = ${directory:run}/cros_full_build
rendered = ${directory:run}/cros_full_build
md5sum =
184bc327b159b083e8f8a9dd8b63cef9
md5sum =
df47d0c2f479d3b93fcb83b50fd9de40
mode = 0700
mode = 0700
context =
context =
key bash_path bin:bash
key bash_path bin:bash
...
...
software/nayuos/scripts/cros_full_build.in
View file @
a37b9222
...
@@ -331,6 +331,7 @@ for board in ${BOARDS} ; do
...
@@ -331,6 +331,7 @@ for board in ${BOARDS} ; do
echo "building image" >> "${BUILD_LOG}"
echo "building image" >> "${BUILD_LOG}"
if [ {{ dev_server}} == "yes" ] ; then
if [ {{ dev_server}} == "yes" ] ; then
cros_sdk -- ./start_devserver &
cros_sdk -- ./start_devserver &
RUNNING_DEVSERVER=$!
ROOTFS_VERIFICATION_FLAG = "--noenable_rootfs_verification"
ROOTFS_VERIFICATION_FLAG = "--noenable_rootfs_verification"
else
else
ROOTFS_VERIFICATION_FLAG = ""
ROOTFS_VERIFICATION_FLAG = ""
...
@@ -341,6 +342,9 @@ for board in ${BOARDS} ; do
...
@@ -341,6 +342,9 @@ for board in ${BOARDS} ; do
&& cros_sdk -- ./test_nayuos_image ${board} > "${TEST_LOG}" \
&& cros_sdk -- ./test_nayuos_image ${board} > "${TEST_LOG}" \
|| { echo "An error occured while building ${board} NayuOS image. Exiting." ; exit 1 ;}
|| { echo "An error occured while building ${board} NayuOS image. Exiting." ; exit 1 ;}
if [ {{ dev_server }} == "yes" ] ; then
kill ${RUNNING_DEVSERVER}
fi
# save a lot of space on the server but delete cache and build files
# save a lot of space on the server but delete cache and build files
# (it means that the next build will be as long and use as much resources as this one)
# (it means that the next build will be as long and use as much resources as this one)
if [ ${KEEP_CACHE,,} == "no" ] ; then
if [ ${KEEP_CACHE,,} == "no" ] ; then
...
...
software/nayuos/software.cfg
View file @
a37b9222
...
@@ -28,7 +28,7 @@ recipe = slapos.recipe.template:jinja2
...
@@ -28,7 +28,7 @@ recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/instance.cfg
template = ${:_profile_base_location_}/instance.cfg
rendered = ${buildout:directory}/instance.cfg
rendered = ${buildout:directory}/instance.cfg
mode = 0644
mode = 0644
md5sum =
39b2dcfd8feb54926626a813874994d3
md5sum =
de7a962f8af74a85f00d2b4c4b916ec5
context =
context =
key software_dir :_profile_base_location_
key software_dir :_profile_base_location_
key instance_dir buildout:directory
key instance_dir buildout:directory
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment