Commit 68c28435 authored by Łukasz Nowak's avatar Łukasz Nowak

- use slapos.rebootstrap in version 2.0 (only 2.12 flavour)

Python will be provided by buildout, but outside of usual buildout environment
(with own parts-directory and installed file). Because of this python binary
which is used to run buildout will no more suffer from uncontrolled rebuilds of
python or its dependencies, as python will be not automatically updated. By
changing rebootstrap:version value it is possible to *add* new python
compilation or switch to existing one.

As, even if python is provided by "same" buildout, but it is out of usual
bin/buildout control, there is no need to recompile it (after rebootstrap is
run buildout:executable becomes "self provided python"). So that is why python
compilation is avoided and python with dependencies can be safely deleted.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40977 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 00a1fcb8
...@@ -27,7 +27,6 @@ parts = ...@@ -27,7 +27,6 @@ parts =
supervisor-instance supervisor-instance
memcached-instance memcached-instance
python = software_definition
versions = versions versions = versions
[eggs] [eggs]
......
...@@ -33,10 +33,6 @@ extends = ...@@ -33,10 +33,6 @@ extends =
../software-profiles/varnish.cfg ../software-profiles/varnish.cfg
../software-profiles/xpdf.cfg ../software-profiles/xpdf.cfg
rebootstrap-section = python2.6
python = software_definition
versions = versions versions = versions
parts = parts =
...@@ -72,6 +68,16 @@ parts = ...@@ -72,6 +68,16 @@ parts =
precache-eggs precache-eggs
software_home software_home
[bootstrap2.6]
# as bootstrap in python software does not know that slapos.rebootstrap >= 2.0
# is used it is required to go back to default -- use own version of python
python = buildout
[rebootstrap]
# This is first version of python
version = 1
section = python2.6
[software_definition] [software_definition]
software_home = ${buildout:software_home} software_home = ${buildout:software_home}
executable = ${python2.6:executable} executable = ${python2.6:executable}
...@@ -12,3 +12,6 @@ Products.DCWorkflow = 2.2.1nxd001 ...@@ -12,3 +12,6 @@ Products.DCWorkflow = 2.2.1nxd001
# 1.0.3 fixes bug https://bugs.launchpad.net/zelenium/+bug/673610 # 1.0.3 fixes bug https://bugs.launchpad.net/zelenium/+bug/673610
Products.Zelenium >= 1.0.3 Products.Zelenium >= 1.0.3
# Use new version of slapos.rebootstrap
slapos.rebootstrap >= 2.0
...@@ -29,6 +29,3 @@ xml-marshaller >= 0.9.2 ...@@ -29,6 +29,3 @@ xml-marshaller >= 0.9.2
distribute = distribute =
zc.buildout = zc.buildout =
setuptools = setuptools =
# use well known version of slapos.rebootstrap, 1.0
slapos.rebootstrap = 1.0
...@@ -13,3 +13,6 @@ lxml = 2.2.8 ...@@ -13,3 +13,6 @@ lxml = 2.2.8
#pysvn = 1.7.2 #pysvn = 1.7.2
# zc.recipe.egg is pinned as this is known compatible versions with # zc.recipe.egg is pinned as this is known compatible versions with
zc.recipe.egg = 1.2.2 zc.recipe.egg = 1.2.2
# use well known version of slapos.rebootstrap, 1.0
slapos.rebootstrap = 1.0
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment