Commit 584c17a2 authored by Rafael Monnerat's avatar Rafael Monnerat

Merge branch 'erp5'

parents 27381368 3e561d8d
...@@ -17,13 +17,14 @@ recipe = hexagonit.recipe.cmmi ...@@ -17,13 +17,14 @@ recipe = hexagonit.recipe.cmmi
version = 5.14.1 version = 5.14.1
url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2 url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
md5sum = 97cd306a2c22929cc141a09568f43bb0 md5sum = 97cd306a2c22929cc141a09568f43bb0
siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}
patch-options = -p1 patch-options = -p1
patches = patches =
${perl-keep-linker-flags-in-ldflags.patch:location}/${perl-keep-linker-flags-in-ldflags.patch:filename} ${perl-keep-linker-flags-in-ldflags.patch:location}/${perl-keep-linker-flags-in-ldflags.patch:filename}
configure-command = configure-command =
sh Configure -des \ sh Configure -des \
-Dprefix=${buildout:parts-directory}/${:_buildout_section_name_} \ -Dprefix=${buildout:parts-directory}/${:_buildout_section_name_} \
-Dsiteprefix=${buildout:parts-directory}/site_${:_buildout_section_name_} \ -Dsiteprefix=${:siteprefix} \
-Dcflags=-I${gdbm:location}/include \ -Dcflags=-I${gdbm:location}/include \
-Dldflags="-L${gdbm:location}/lib -Wl,-rpath=${gdbm:location}/lib" \ -Dldflags="-L${gdbm:location}/lib -Wl,-rpath=${gdbm:location}/lib" \
-Ui_db \ -Ui_db \
......
...@@ -9,6 +9,7 @@ develop-eggs-directory = ${buildout:develop-eggs-directory} ...@@ -9,6 +9,7 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
recipe = ${instance-recipe:egg}:${instance-recipe:module} recipe = ${instance-recipe:egg}:${instance-recipe:module}
dcrond_binary = ${dcron:location}/sbin/crond dcrond_binary = ${dcron:location}/sbin/crond
haproxy_binary = ${haproxy:location}/sbin/haproxy haproxy_binary = ${haproxy:location}/sbin/haproxy
gzip_binary = ${gzip:location}/bin/gzip
httpd_binary = ${apache:location}/bin/httpd httpd_binary = ${apache:location}/bin/httpd
innobackupex_binary = ${xtrabackup:location}/bin/innobackupex innobackupex_binary = ${xtrabackup:location}/bin/innobackupex
kumo_gateway_binary = ${kumo:location}/bin/kumo-gateway kumo_gateway_binary = ${kumo:location}/bin/kumo-gateway
...@@ -32,6 +33,14 @@ tidstorage_repozo_binary = ${buildout:bin-directory}/tidstorage_repozo ...@@ -32,6 +33,14 @@ tidstorage_repozo_binary = ${buildout:bin-directory}/tidstorage_repozo
tidstoraged_binary = ${buildout:bin-directory}/tidstoraged tidstoraged_binary = ${buildout:bin-directory}/tidstoraged
xtrabackup_binary = ${xtrabackup:location}/bin/xtrabackup_51 xtrabackup_binary = ${xtrabackup:location}/bin/xtrabackup_51
zabbix_agent_binary = ${zabbix-agent:location}/sbin/zabbix_agent zabbix_agent_binary = ${zabbix-agent:location}/sbin/zabbix_agent
mk-variable-advisor_binary = ${perl:siteprefix}/bin/mk-variable-advisor
mk-table-usage_binary = ${perl:siteprefix}/bin/mk-table-usage
mk-visual-explain_binary = ${perl:siteprefix}/bin/mk-visual-explain
mk-config-diff_binary = ${perl:siteprefix}/bin/mk-config-diff
mk-deadlock-logger_binary = ${perl:siteprefix}/bin/mk-deadlock-logger
mk-error-log_binary = ${perl:siteprefix}/bin/mk-error-log
mk-index-usage_binary = ${perl:siteprefix}/bin/mk-index-usage
mk-query-advisor_binary = ${perl:siteprefix}/bin/mk-query-advisor
# cloudooo specific configuration # cloudooo specific configuration
ooo_binary_path = ${libreoffice-bin:location}/program ooo_binary_path = ${libreoffice-bin:location}/program
......
...@@ -28,7 +28,7 @@ configurator_bt5_list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catal ...@@ -28,7 +28,7 @@ configurator_bt5_list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catal
# Default template for erp5 instance. # Default template for erp5 instance.
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg url = ${:_profile_base_location_}/instance.cfg
md5sum = cc268ff0f27fa1ed4839a3150980f4a7 md5sum = 77062d472e88aca0fe632bdee4f9bb21
output = ${buildout:directory}/template.cfg output = ${buildout:directory}/template.cfg
mode = 0644 mode = 0644
...@@ -82,13 +82,14 @@ hexagonit.recipe.download = 1.5.0 ...@@ -82,13 +82,14 @@ hexagonit.recipe.download = 1.5.0
http-parser = 0.6.2 http-parser = 0.6.2
ipdb = 0.4 ipdb = 0.4
meld3 = 0.6.7 meld3 = 0.6.7
mr.developer = 1.17
ordereddict = 1.1 ordereddict = 1.1
paramiko = 1.7.7.1 paramiko = 1.7.7.1
plone.recipe.command = 1.1 plone.recipe.command = 1.1
ply = 3.4 ply = 3.4
psutil = 0.2.1 psutil = 0.3.0
pycrypto = 2.3 pycrypto = 2.3
python-ldap = 2.4.0 python-ldap = 2.4.1
python-memcached = 1.45 python-memcached = 1.45
restkit = 3.3.0 restkit = 3.3.0
rtjp-eventlet = 0.3.2 rtjp-eventlet = 0.3.2
...@@ -102,8 +103,8 @@ validictory = 0.7.1 ...@@ -102,8 +103,8 @@ validictory = 0.7.1
xupdate-processor = 0.4 xupdate-processor = 0.4
# Required by: # Required by:
# slapos.core==0.8 # slapos.core==0.12
Flask = 0.7.1 Flask = 0.7.2
# Required by: # Required by:
# PasteScript==1.7.3 # PasteScript==1.7.3
...@@ -116,7 +117,7 @@ WSGIUtils = 0.7 ...@@ -116,7 +117,7 @@ WSGIUtils = 0.7
# Required by: # Required by:
# cloudooo==1.2.3 # cloudooo==1.2.3
# slapos.core==0.8 # slapos.core==0.12
argparse = 1.1 argparse = 1.1
# Required by: # Required by:
...@@ -136,7 +137,7 @@ ipython = 0.10.2 ...@@ -136,7 +137,7 @@ ipython = 0.10.2
netaddr = 0.7.5 netaddr = 0.7.5
# Required by: # Required by:
# slapos.core==0.8 # slapos.core==0.12
netifaces = 0.4 netifaces = 0.4
# Required by: # Required by:
...@@ -144,15 +145,36 @@ netifaces = 0.4 ...@@ -144,15 +145,36 @@ netifaces = 0.4
python-magic = 0.4.0.1 python-magic = 0.4.0.1
# Required by: # Required by:
# Products.CMFActionIcons==2.1.3
# Products.CMFCalendar==2.2.2
# Products.CMFCore==2.2.4
# Products.CMFDefault==2.2.2
# Products.CMFTopic==2.2.1
# Products.CMFUid==2.2.1
# Products.DCWorkflow==2.2.3nxd002
# Products.DCWorkflowGraph==0.4nxd001
# Products.ExternalEditor==1.1.0
# Products.GenericSetup==1.6.3
# Products.MimetypesRegistry==2.0.2
# Products.PluggableAuthService==1.7.5
# Products.PluginRegistry==1.3b1
# Products.TIDStorage==5.4.7.dev-r45842
# Products.Zelenium==1.0.3
# Zope2==2.12.19
# five.localsitemanager==2.0.5
# mr.developer==1.17
# python-ldap==2.4.1
# zc.buildout==1.5.3-dev-SlapOS-005 # zc.buildout==1.5.3-dev-SlapOS-005
# zope.deprecation==3.4.0
# zope.structuredtext==3.4.0
setuptools = 0.6c12dev-r88846 setuptools = 0.6c12dev-r88846
# Required by: # Required by:
# slapos.cookbook==0.16 # slapos.cookbook==0.16
slapos.core = 0.8 slapos.core = 0.12
# Required by: # Required by:
# slapos.core==0.8 # slapos.core==0.12
supervisor = 3.0a10 supervisor = 3.0a10
# Required by: # Required by:
......
...@@ -20,7 +20,7 @@ repository_id_list += vifib/master ...@@ -20,7 +20,7 @@ repository_id_list += vifib/master
[vifib] [vifib]
<= erp5 <= erp5
repository = http://git.erp5.org/repos/slapos.core.git repository = http://git.erp5.org/repos/slapos.core.git
revision = bfcd67dae3221612d035fa13ddc5afaec1518270 revision = 3f766ab93c5312c75b7315a60238c1c5b3e4170d
[local-bt5-repository] [local-bt5-repository]
# XXX: workaround for zc.buildout bug, as list += ends up with adding new entry # XXX: workaround for zc.buildout bug, as list += ends up with adding new entry
......
...@@ -38,12 +38,14 @@ extends = ...@@ -38,12 +38,14 @@ extends =
../component/git/buildout.cfg ../component/git/buildout.cfg
../component/glib/buildout.cfg ../component/glib/buildout.cfg
../component/graphviz/buildout.cfg ../component/graphviz/buildout.cfg
../component/gzip/buildout.cfg
../component/haproxy/buildout.cfg ../component/haproxy/buildout.cfg
../component/hookbox/buildout.cfg ../component/hookbox/buildout.cfg
../component/imagemagick/buildout.cfg ../component/imagemagick/buildout.cfg
../component/kumo/buildout.cfg ../component/kumo/buildout.cfg
../component/libreoffice-bin/buildout.cfg ../component/libreoffice-bin/buildout.cfg
../component/lxml-python/buildout.cfg ../component/lxml-python/buildout.cfg
../component/maatkit/buildout.cfg
../component/mariadb/buildout.cfg ../component/mariadb/buildout.cfg
../component/memcached/buildout.cfg ../component/memcached/buildout.cfg
../component/mysql-python/buildout.cfg ../component/mysql-python/buildout.cfg
...@@ -216,7 +218,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_} ...@@ -216,7 +218,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
stop-on-error = true stop-on-error = true
repository = http://git.erp5.org/repos/erp5.git repository = http://git.erp5.org/repos/erp5.git
branch = master branch = master
revision = 5d4862dc888506fb58905ddf2ed68b5803689af3 revision = dd36cf064495e04f2ad0eaa9c527a2c3246e9ecb
command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location} && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location} && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
update-command = cd ${:location} && ${git:location}/bin/git pull --quiet && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi update-command = cd ${:location} && ${git:location}/bin/git pull --quiet && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
......
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