[nayuos] Polished buildout files

software/nayuos/instance.cfg

+# Jinja2 template of a buildout file to create runnable scripts
+#
+# Received variables
+# -  software_dir: location where this repository was cloned to
+# -  instance_dir: location where this 'instance.cfg' is gettin rendered (same as ${buildout:directory})
+
 [buildout]
 parts =
   parameters
@@ -17,18 +23,18 @@ develop-eggs-directory = {{ develop_eggs_directory }}
 recipe = slapos.recipe.build:gitclone
 repository = https://chromium.googlesource.com/chromium/tools/depot_tools.git
 branch = master
-git-executable = {{ git_path }}/git
+git-executable = {{ git_path }}/bin/git
 
 [customize-path]
 # add depot tools directory (for cros_sdk binary among others) and git directory to the path
 command =
-  export PATH="${directory:wrapper_dir}":"{{ git_path }}":"{{ curl_path }}":"${depot-tools:location}":"$PATH";
+  export PATH="${directory:wrapper_dir}":"{{ git_path }}/bin":"{{ curl_path }}/bin":"${depot-tools:location}":"$PATH";
 
 [nayuos-ebuilds]
 recipe = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/nayuos-ebuilds.git
 branch = master
-git-executable = {{ git_path }}/git
+git-executable = {{ git_path }}/bin/git
 
 ############################################################################################
 
@@ -51,25 +57,22 @@ run = ${buildout:directory}/etc/run
 promise = ${buildout:directory}/etc/promise
 wrapper_dir = ${buildout:directory}/wrapper_bin
 cros_location = ${buildout:directory}/parts/chromiumos
-ebuilds_dir = ${nayuos-ebuilds:location}
-scripts_dir = {{ scripts_dir }}
-logo_dir = {{ logo_dir }}
 
 [bin]
+# dummy section to hold references to frequently used binaries
 wrapper_cros_sdk=${directory:wrapper_dir}/wrapper_cros_sdk
 bash=/bin/bash
 sudo=/usr/bin/sudo
 
 [promise-sudo-on-host]
-# assert sudo is installed on the slapos host, as it is required to enter the
-# chroot 'cros_sdk'
+# assert sudo is installed, as it is required to enter the chroot 'cros_sdk'
 recipe  = slapos.cookbook:wrapper
 wrapper-path = ${directory:promise}/${:_buildout_section_name_}
 command-line = sudo -V
 
 [template-sudo-wrapper]
 recipe = slapos.recipe.template:jinja2
-template = {{ scripts_dir }}/wrapper_sudo.in
+template = {{ software_dir }}/scripts/wrapper_sudo.in
 rendered = ${directory:wrapper_dir}/sudo
 md5sum = ded5a92be4e37ec32eb9d3087d3e19bd
 mode = 0700
@@ -80,21 +83,21 @@ context =
 
 [template-cros-sdk-wrapper]
 recipe = slapos.recipe.template:jinja2
-template = {{ scripts_dir }}/wrapper_cros_sdk.in
+template = {{ software_dir }}/scripts/wrapper_cros_sdk.in
 rendered = ${bin:wrapper_cros_sdk}
 md5sum = 7159fe3d5b85a283733cf686c4ee0a74
 mode = 0700
 context =
 # XXX bash path is the one from the host
   key bash_path bin:bash
-  raw git_path  {{ git_path }}
-  raw curl_path {{ curl_path }}
+  raw git_path  {{ git_path }}/bin
+  raw curl_path {{ curl_path }}/bin
 
 [template-full-build-script]
 # create the rendered script in the buildout-directory/etc/run
 # (use jinja for templating)
 recipe = slapos.recipe.template:jinja2
-template = {{ scripts_dir }}/cros_full_build.in
+template = {{ software_dir }}/scripts/cros_full_build.in
 rendered = ${directory:run}/cros_full_build
 md5sum = 2bb9dd83260ea96dd6a6602f6faa9794
 mode = 0700
@@ -106,8 +109,11 @@ context =
   key branch                            parameters:configuration.branch
   key boards_list                       parameters:configuration.boards
   key keep_cache                        parameters:configuration.keep_cache
-  key ebuilds_dir                       directory:ebuilds_dir
-  key scripts_dir                       directory:scripts_dir
-  key logo_dir                          directory:logo_dir
+  key ebuilds_dir                       nayuos-ebuilds:location
+  raw scripts_dir                       {{ software_dir }}/scripts
+  raw logo_dir                          {{ software_dir }}/logo
+# packages to be copied from our overlay into ChromiuOS' overlay
+# those packages will be marked as dependency of root filesystem
   raw nayu_dev_rootfs_packages          app-misc/nayuos-chromium-policy
+# those packages will be marked as dependency of the chromium build itself
   raw nayu_dev_packages                 net-misc/re6stnet dev-vcs/git dev-python/flask dev-python/virtualenv sys-fs/cryptsetup

software/nayuos/software.cfg

@@ -4,33 +4,30 @@ extends =
   ../../stack/slapos.cfg
 
 parts +=
-# use stack/slapos.cfg
   slapos-cookbook
   template-instance
+  git
+  curl
 
 versions = versions
 
+
 [versions]
 slapos.recipe.template = 3.0
 
 
 [template-instance]
-# create the instance.cfg file in the buildout directory
-# (use jinja for templating)
+# jinja2 render instance.cfg file in the buildout directory
 recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/instance.cfg
 rendered = ${buildout:directory}/instance.cfg
 mode = 0644
-md5sum = 472e37b443d29c5b018f822d4b23faac
-scripts_dir = ${:_profile_base_location_}/scripts
-logo_dir = ${:_profile_base_location_}/logo
-curl_path = ${curl:location}/bin
-git_path = ${git:location}/bin
+md5sum = 154882944c6a58642629c17d47b4f6fc
 context =
-  key scripts_dir             :scripts_dir
-  key logo_dir                :logo_dir
-  key curl_path               :curl_path
-  key git_path                :git_path
+  key software_dir            :_profile_base_location_
+  key instance_dir            buildout:directory
+  key curl_path               curl:location
+  key git_path                git:location
   key eggs_directory          buildout:eggs-directory
   key develop_eggs_directory  buildout:develop-eggs-directory