nayuos: cleaning of the software and instance

configuration files

software/nayuos/instance.cfg

@@ -5,7 +5,7 @@ parts =
   template-sudo-wrapper
   template-cros-sdk-wrapper
 
-# eggs given by software.cfg
+# standard declaration of eggs directories
 eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
 
@@ -16,6 +16,7 @@ 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
 
 [customize-path]
 # add depot tools directory (for cros_sdk binary among others) and git directory to the path
@@ -26,6 +27,7 @@ command =
 recipe = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/nayuos-ebuilds.git
 branch = master
+git-executable = {{ git_path }}/git
 
 ############################################################################################
 
@@ -76,7 +78,7 @@ mode = 0700
 context =
 # XXX bash path is the one from the host
   key bash_path bin:bash
-  raw git_path {{ git_path }}
+  raw git_path  {{ git_path }}
   raw curl_path {{ curl_path }}
 
 [template-full-build-script]
@@ -88,15 +90,15 @@ rendered = ${directory:run}/cros_full_build
 md5sum = d6342b3a578fecd50ef86c6efd7b68bb
 mode = 0700
 context =
-  key bash_path bin:bash
-  key instance_log_dir directory:log
-  key cros_location directory:cros_location
-  key export_path_cmd customize-path:command
-  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
-  raw nayu_dev_rootfs_packages app-misc/nayuos-chromium-policy
+  key bash_path                         bin:bash
+  key instance_log_dir                  directory:log
+  key cros_location                     directory:cros_location
+  key export_path_cmd                   customize-path:command
+  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
+  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

software/nayuos/software.cfg

@@ -6,28 +6,10 @@ extends =
 parts +=
 # use stack/slapos.cfg
   slapos-cookbook
-  verify-packages-exist-on-host
   template-instance
-  install-eggs-for-the-instance
-
-#add eggs needed by the instance
-find-links += 
-  https://pypi.python.org/packages/source/s/slapos.recipe.build/slapos.recipe.build-0.21.tar.gz
-  https://pypi.python.org/packages/source/p/plone.recipe.command/plone.recipe.command-1.1.zip
-
-versions = versions
 
 [versions]
-plone.recipe.command = 1.1
-slapos.recipe.template = 2.8
-slapos.recipe.build = 0.21
-
-[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
+slapos.recipe.template = 2.9
 
 [template-instance]
 # create the instance.cfg file in the buildout directory
@@ -35,24 +17,16 @@ command = sudo -V
 recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/instance.cfg
 rendered = ${buildout:directory}/instance.cfg
-md5sum = beae7b081543219fdf4f402681fa8af5
+md5sum = 0d26dd9f3f30504409142c6f701a9221
 mode = 0644
 scripts_dir = ${:_profile_base_location_}/scripts
 logo_dir = ${:_profile_base_location_}/logo
 curl_path = ${curl:location}/bin
 git_path = ${git:location}/bin
 context =
-# for access to the eggs from the instance
-  key eggs_directory buildout:eggs-directory
-  key develop_eggs_directory buildout:develop-eggs-directory
-  key scripts_dir :scripts_dir
-  key logo_dir :logo_dir
-  key curl_path :curl_path
-  key git_path :git_path
+  key scripts_dir             :scripts_dir
+  key logo_dir                :logo_dir
+  key curl_path               :curl_path
+  key git_path                :git_path
+  key eggs_directory          buildout:eggs-directory
+  key develop_eggs_directory  buildout:develop-eggs-directory
\ 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