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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
slapos
Commits
6728e4aa
Commit
6728e4aa
authored
Oct 19, 2016
by
iv
Committed by
Tomáš Peterka
Aug 04, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nayuos: cleaning of the software and instance
configuration files
parent
2561132f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
38 deletions
+23
-38
software/nayuos/instance.cfg
software/nayuos/instance.cfg
+15
-13
software/nayuos/software.cfg
software/nayuos/software.cfg
+8
-25
No files found.
software/nayuos/instance.cfg
View file @
6728e4aa
...
@@ -5,7 +5,7 @@ parts =
...
@@ -5,7 +5,7 @@ parts =
template-sudo-wrapper
template-sudo-wrapper
template-cros-sdk-wrapper
template-cros-sdk-wrapper
#
eggs given by software.cfg
#
standard declaration of eggs directories
eggs-directory = {{ eggs_directory }}
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
...
@@ -16,6 +16,7 @@ develop-eggs-directory = {{ develop_eggs_directory }}
...
@@ -16,6 +16,7 @@ develop-eggs-directory = {{ develop_eggs_directory }}
recipe = slapos.recipe.build:gitclone
recipe = slapos.recipe.build:gitclone
repository = https://chromium.googlesource.com/chromium/tools/depot_tools.git
repository = https://chromium.googlesource.com/chromium/tools/depot_tools.git
branch = master
branch = master
git-executable = {{ git_path }}/git
[customize-path]
[customize-path]
# add depot tools directory (for cros_sdk binary among others) and git directory to the path
# add depot tools directory (for cros_sdk binary among others) and git directory to the path
...
@@ -26,6 +27,7 @@ command =
...
@@ -26,6 +27,7 @@ command =
recipe = slapos.recipe.build:gitclone
recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/nayuos-ebuilds.git
repository = https://lab.nexedi.com/nexedi/nayuos-ebuilds.git
branch = master
branch = master
git-executable = {{ git_path }}/git
############################################################################################
############################################################################################
...
@@ -76,7 +78,7 @@ mode = 0700
...
@@ -76,7 +78,7 @@ mode = 0700
context =
context =
# XXX bash path is the one from the host
# XXX bash path is the one from the host
key bash_path bin:bash
key bash_path bin:bash
raw git_path {{ git_path }}
raw git_path
{{ git_path }}
raw curl_path {{ curl_path }}
raw curl_path {{ curl_path }}
[template-full-build-script]
[template-full-build-script]
...
@@ -88,15 +90,15 @@ rendered = ${directory:run}/cros_full_build
...
@@ -88,15 +90,15 @@ rendered = ${directory:run}/cros_full_build
md5sum = d6342b3a578fecd50ef86c6efd7b68bb
md5sum = d6342b3a578fecd50ef86c6efd7b68bb
mode = 0700
mode = 0700
context =
context =
key bash_path bin:bash
key bash_path
bin:bash
key instance_log_dir directory:log
key instance_log_dir
directory:log
key cros_location directory:cros_location
key cros_location
directory:cros_location
key export_path_cmd customize-path:command
key export_path_cmd
customize-path:command
key branch parameters:configuration.branch
key branch
parameters:configuration.branch
key boards_list parameters:configuration.boards
key boards_list
parameters:configuration.boards
key keep_cache parameters:configuration.keep_cache
key keep_cache
parameters:configuration.keep_cache
key ebuilds_dir directory:ebuilds_dir
key ebuilds_dir
directory:ebuilds_dir
key scripts_dir directory:scripts_dir
key scripts_dir
directory:scripts_dir
key logo_dir directory:logo_dir
key logo_dir
directory:logo_dir
raw nayu_dev_rootfs_packages app-misc/nayuos-chromium-policy
raw nayu_dev_rootfs_packages
app-misc/nayuos-chromium-policy
raw nayu_dev_packages net-libs/nodejs net-misc/re6stnet dev-vcs/git dev-python/flask dev-python/virtualenv sys-fs/cryptsetup
raw nayu_dev_packages net-libs/nodejs net-misc/re6stnet dev-vcs/git dev-python/flask dev-python/virtualenv sys-fs/cryptsetup
software/nayuos/software.cfg
View file @
6728e4aa
...
@@ -6,19 +6,10 @@ extends =
...
@@ -6,19 +6,10 @@ extends =
parts +=
parts +=
# use stack/slapos.cfg
# use stack/slapos.cfg
slapos-cookbook
slapos-cookbook
verify-packages-exist-on-host
template-instance
template-instance
install-eggs-for-the-instance
[versions]
[versions]
slapos.recipe.template = 3.0
slapos.recipe.template = 2.9
[verify-packages-exist-on-host]
recipe = plone.recipe.command
stop-on-error = true
# run the same command when installing and on updates
update-command = ${:command}
command = sudo -V
[template-instance]
[template-instance]
# create the instance.cfg file in the buildout directory
# create the instance.cfg file in the buildout directory
...
@@ -26,24 +17,16 @@ command = sudo -V
...
@@ -26,24 +17,16 @@ command = sudo -V
recipe = slapos.recipe.template:jinja2
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
md5sum =
beae7b081543219fdf4f402681fa8af5
md5sum =
0d26dd9f3f30504409142c6f701a9221
mode = 0644
mode = 0644
scripts_dir = ${:_profile_base_location_}/scripts
scripts_dir = ${:_profile_base_location_}/scripts
logo_dir = ${:_profile_base_location_}/logo
logo_dir = ${:_profile_base_location_}/logo
curl_path = ${curl:location}/bin
curl_path = ${curl:location}/bin
git_path = ${git:location}/bin
git_path = ${git:location}/bin
context =
context =
# for access to the eggs from the instance
key scripts_dir :scripts_dir
key eggs_directory buildout:eggs-directory
key logo_dir :logo_dir
key develop_eggs_directory buildout:develop-eggs-directory
key curl_path :curl_path
key scripts_dir :scripts_dir
key git_path :git_path
key logo_dir :logo_dir
key eggs_directory buildout:eggs-directory
key curl_path :curl_path
key develop_eggs_directory buildout:develop-eggs-directory
key git_path :git_path
\ No newline at end of file
[install-eggs-for-the-instance]
# after installation of the eggs, the recipes
# will be available (added to sys.path)
recipe = zc.recipe.egg
eggs = slapos.recipe.build
plone.recipe.command
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