Reduce diff with upstream for cookbook development

software/erp5/software.cfg

@@ -27,8 +27,12 @@ unzip = true
 recipe = plone.recipe.command
 stop-on-error = true
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-command = ${git:location}/bin/git clone --branch erp5-generic --quiet http://git.erp5.org/repos/slapos.git ${:location}
-update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
+repository = https://saneftestbot:kucahS5oav6jahch@git.erp5.org/repos/slapos/sanef.git
+branch = CR1094
+# Note: GIT_SSL_NO_VERIFY is used as SlapOS OpenSSL configuration does not
+# contain master certificates to verify.
+command = (GIT_SSL_NO_VERIFY=1 ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location}) || (rm -fr ${:location} && exit 1) 
+update-command = 
 
 [check-recipe]
 recipe = plone.recipe.command

software/sanef/software.cfg

 [buildout]
 develop =
-  ${:parts-directory}/bef_erp5-recipe
   ${:parts-directory}/z2loganalyser
 
 extends =
@@ -24,7 +23,6 @@ parts +=
 # - [instance-recipe] needs [bef_erp5-recipe] to be finished
 # - we cannot rely on anything else being executed before [eggs]
 bef_dummy =
-  ${bef_erp5-recipe:location}
   ${z2loganalyser:location}
 
 # XXX: Workaround for hack;
@@ -48,10 +46,6 @@ stop-on-error = true
 update-command = ${:command}
 command = grep parts ${buildout:develop-eggs-directory}/${:egg}.egg-link
 
-[checkrecipe]
-<= eggcheck
-egg = slapos.cookbook
-
 [checkz2loganalyser]
 <= eggcheck
 egg = z2loganalyser
@@ -112,14 +106,3 @@ command =
 # list of products, possible to extend, it is passed in reversed way
 # to allow overriding during extending profile
 list = ${products-deps:location} ${products-upgrade:location}
-
-[bef_erp5-recipe]
-recipe = plone.recipe.command
-stop-on-error = true
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-repository = https://saneftestbot:kucahS5oav6jahch@git.erp5.org/repos/slapos/sanef.git
-branch = CR1094
-# Note: GIT_SSL_NO_VERIFY is used as SlapOS OpenSSL configuration does not
-# contain master certificates to verify.
-command = (GIT_SSL_NO_VERIFY=1 ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location}) || (rm -fr ${:location} && exit 1) 
-update-command =