nayuos: cleaning of the software and instance

configuration files

Conflicts:
	software/nayuos/instance.cfg
	software/nayuos/software.cfg

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
 
 ############################################################################################
 

software/nayuos/software.cfg

@@ -6,28 +6,18 @@ extends =
 parts +=
 # use stack/slapos.cfg
   slapos-cookbook
-  verify-packages-exist-on-host
   template-instance
-  install-eggs-for-the-instance
 
+# 2017-06-28: XXX is this really necessary? Remove after successful build
 #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
+#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 +25,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
-
-[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
+  key eggs_directory          buildout:eggs-directory
+  key develop_eggs_directory  buildout:develop-eggs-directory