Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Justin
slapos
Commits
469cd87e
Commit
469cd87e
authored
Feb 28, 2013
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/erp5' into erp5-component
parents
c3515891
4d12f08f
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
13 additions
and
84 deletions
+13
-84
component/gcc/buildout.cfg
component/gcc/buildout.cfg
+1
-60
software/cloudooo/instance-cloudoo.cfg.in
software/cloudooo/instance-cloudoo.cfg.in
+0
-1
software/cloudooo/instance.cfg.in
software/cloudooo/instance.cfg.in
+0
-1
software/cloudooo/software.cfg
software/cloudooo/software.cfg
+1
-2
stack/cloudooo.cfg
stack/cloudooo.cfg
+0
-6
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+11
-9
stack/erp5/instance-tidstorage.cfg.in
stack/erp5/instance-tidstorage.cfg.in
+0
-1
stack/erp5/instance-zope.cfg.in
stack/erp5/instance-zope.cfg.in
+0
-1
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+0
-3
No files found.
component/gcc/buildout.cfg
View file @
469cd87e
...
@@ -55,13 +55,6 @@ environment =
...
@@ -55,13 +55,6 @@ environment =
PATH=${m4:location}/bin:%(PATH)s
PATH=${m4:location}/bin:%(PATH)s
LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${ppl:location}/lib
LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${ppl:location}/lib
[ecj]
recipe = hexagonit.recipe.download
download-only = true
url = ftp://sourceware.org/pub/java/ecj-4.5.jar
md5sum = d7cd6a27c8801e66cbaa964a039ecfdb
filename = ecj.jar
[gcc-download]
[gcc-download]
hack-revision = ${gcc-interconnection-workaround:hack-revision}
hack-revision = ${gcc-interconnection-workaround:hack-revision}
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
...
@@ -70,15 +63,6 @@ md5sum = 8e0b5c12212e185f3e4383106bfa9cc6
...
@@ -70,15 +63,6 @@ md5sum = 8e0b5c12212e185f3e4383106bfa9cc6
strip-top-level-dir = True
strip-top-level-dir = True
destination = ${gcc-source:location}
destination = ${gcc-source:location}
[gcc-java-download]
hack-revision = ${gcc-interconnection-workaround:hack-revision}
recipe = hexagonit.recipe.download
url = http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.5.3/gcc-java-4.5.3.tar.bz2
md5sum = 08e045fdbdc22ac9af3aec3b8d16dbab
strip-top-level-dir = True
destination = ${gcc-source:location}
ignore-existing = true
[gcc-source]
[gcc-source]
hack-revision = ${gcc-interconnection-workaround:hack-revision}
hack-revision = ${gcc-interconnection-workaround:hack-revision}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
...
@@ -90,53 +74,10 @@ url = ${:_profile_base_location_}/${:filename}
...
@@ -90,53 +74,10 @@ url = ${:_profile_base_location_}/${:filename}
filename = ${:_buildout_section_name_}
filename = ${:_buildout_section_name_}
download-only = true
download-only = true
[gcc-java-pre-4.4.patch]
recipe = hexagonit.recipe.download
md5sum = 9a563576126d9fcf234ef29c2fc7df76
url = ${:_profile_base_location_}/${:filename}
filename = ${:_buildout_section_name_}
download-only = true
[gcc-java-minimal]
hack-revision = ${gcc-interconnection-workaround:hack-revision}
depends =
${gcc-download:location}
${gcc-java-download:location}
recipe = hexagonit.recipe.cmmi
path = ${gcc-source:location}
md5sum = bb3265edf0fa7543e50cedb93e04e427
patches =
${gcc-multiarch.patch:location}/${gcc-multiarch.patch:filename}
${gcc-java-pre-4.4.patch:location}/${gcc-java-pre-4.4.patch:filename}
patch-options = -p2
configure-command = make clean \\; make distclean \\; ./configure
# GMP does not correctly detect achitecture so it have to be given
# as hexagonit.recipe.cmmi is using shell expansion in subproceses
# backticks are working
configure-options =
--disable-bootstrap
--enable-languages=java
--disable-multilib
--with-gmp=${gmp:location}
--with-mpfr=${mpfr:location}
--with-mpc=${mpc:location}
--with-ecj-jar=${ecj:location}/${ecj:filename}
--prefix=${buildout:parts-directory}/${:_buildout_section_name_}
--without-ppl
--without-cloog
environment =
CPPFLAGS =-I${mpfr:location}/include -I${gmp:location}/include -I${mpc:location}/include
LDFLAGS =-L${mpfr:location}/lib -Wl,-rpath=${mpfr:location}/lib -L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${mpc:location}/lib
PATH=${zip:location}/bin:%(PATH)s
# make install does not work when several core are used
make-targets = install -j1
[gcc]
[gcc]
hack-revision = ${gcc-interconnection-workaround:hack-revision}
hack-revision = ${gcc-interconnection-workaround:hack-revision}
depends =
depends =
${gcc-download:location}
${gcc-download:location}
${gcc-java-download:location}
recipe = hexagonit.recipe.cmmi
recipe = hexagonit.recipe.cmmi
path = ${gcc-source:location}
path = ${gcc-source:location}
md5sum = bb3265edf0fa7543e50cedb93e04e427
md5sum = bb3265edf0fa7543e50cedb93e04e427
...
@@ -149,7 +90,7 @@ configure-command = make clean \\; make distclean \\; ./configure
...
@@ -149,7 +90,7 @@ configure-command = make clean \\; make distclean \\; ./configure
# backticks are working
# backticks are working
configure-options =
configure-options =
--disable-bootstrap
--disable-bootstrap
--enable-languages="c,c++
,java
"
--enable-languages="c,c++"
--disable-multilib
--disable-multilib
--with-gmp=${gmp:location}
--with-gmp=${gmp:location}
--with-mpfr=${mpfr:location}
--with-mpfr=${mpfr:location}
...
...
software/cloudooo/instance-cloudoo.cfg.in
View file @
469cd87e
...
@@ -76,7 +76,6 @@ link-binary =
...
@@ -76,7 +76,6 @@ link-binary =
{{ parameter_dict['poppler'] }}/bin/pdfinfo
{{ parameter_dict['poppler'] }}/bin/pdfinfo
{{ parameter_dict['poppler'] }}/bin/pdftotext
{{ parameter_dict['poppler'] }}/bin/pdftotext
{{ parameter_dict['poppler'] }}/bin/pdftohtml
{{ parameter_dict['poppler'] }}/bin/pdftohtml
{{ parameter_dict['pdftk'] }}/bin/pdftk
# rest of parts are candidates for some generic stuff
# rest of parts are candidates for some generic stuff
[basedirectory]
[basedirectory]
...
...
software/cloudooo/instance.cfg.in
View file @
469cd87e
...
@@ -34,7 +34,6 @@ fonts = {{ fonts_location }}
...
@@ -34,7 +34,6 @@ fonts = {{ fonts_location }}
coreutils = {{ coreutils_location }}
coreutils = {{ coreutils_location }}
imagemagick = {{ imagemagick_location }}
imagemagick = {{ imagemagick_location }}
poppler = {{ poppler_location }}
poppler = {{ poppler_location }}
pdftk = {{ pdftk_location }}
buildout-bin-directory = {{ buildout_bin_directory }}
buildout-bin-directory = {{ buildout_bin_directory }}
[dynamic-template-cloudooo]
[dynamic-template-cloudooo]
...
...
software/cloudooo/software.cfg
View file @
469cd87e
[buildout]
[buildout]
extends =
extends =
../../stack/s
hacache-client
.cfg
../../stack/s
lapos
.cfg
../../stack/cloudooo.cfg
../../stack/cloudooo.cfg
versions = versions
versions = versions
...
@@ -90,7 +90,6 @@ extra-context =
...
@@ -90,7 +90,6 @@ extra-context =
key libreoffice_bin_location libreoffice-bin:location
key libreoffice_bin_location libreoffice-bin:location
key libxcb_location libxcb:location
key libxcb_location libxcb:location
key openssl_location openssl:location
key openssl_location openssl:location
key pdftk_location pdftk:location
key poppler_location poppler:location
key poppler_location poppler:location
key template_cloudooo template-cloudooo:target
key template_cloudooo template-cloudooo:target
key zlib_location zlib:location
key zlib_location zlib:location
...
...
stack/cloudooo.cfg
View file @
469cd87e
...
@@ -43,7 +43,6 @@ extends =
...
@@ -43,7 +43,6 @@ extends =
../component/git/buildout.cfg
../component/git/buildout.cfg
../component/poppler/buildout.cfg
../component/poppler/buildout.cfg
../component/imagemagick/buildout.cfg
../component/imagemagick/buildout.cfg
../component/pdftk/buildout.cfg
../component/ffmpeg/buildout.cfg
../component/ffmpeg/buildout.cfg
../component/file/buildout.cfg
../component/file/buildout.cfg
../component/stunnel/buildout.cfg
../component/stunnel/buildout.cfg
...
@@ -76,7 +75,6 @@ parts =
...
@@ -76,7 +75,6 @@ parts =
imagemagick
imagemagick
file
file
poppler
poppler
pdftk
ffmpeg
ffmpeg
bootstrap2.6
bootstrap2.6
...
@@ -93,7 +91,3 @@ python = python2.6
...
@@ -93,7 +91,3 @@ python = python2.6
[versions]
[versions]
# Use SlapOS patched zc.buildout
# Use SlapOS patched zc.buildout
zc.buildout = 1.6.0-dev-SlapOS-006
zc.buildout = 1.6.0-dev-SlapOS-006
# Use patched hexagonit.recipe.download from
# https://github.com/SlapOS/hexagonit.recipe.download
hexagonit.recipe.download = 1.5.1-dev-slapos-001
stack/erp5/buildout.cfg
View file @
469cd87e
...
@@ -15,6 +15,8 @@ find-links =
...
@@ -15,6 +15,8 @@ find-links =
http://www.nexedi.org/static/packages/source/
http://www.nexedi.org/static/packages/source/
http://www.owlfish.com/software/wsgiutils/download.html
http://www.owlfish.com/software/wsgiutils/download.html
allow-hosts += pybrary.net
extends =
extends =
# Exact version of Zope
# Exact version of Zope
http://svn.zope.org/repos/main/Zope/tags/2.12.26/versions.cfg
http://svn.zope.org/repos/main/Zope/tags/2.12.26/versions.cfg
...
@@ -40,7 +42,6 @@ extends =
...
@@ -40,7 +42,6 @@ extends =
../../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
../../component/pdftk/buildout.cfg
../../component/pil-python/buildout.cfg
../../component/pil-python/buildout.cfg
../../component/pycrypto-python/buildout.cfg
../../component/pycrypto-python/buildout.cfg
../../component/pysvn-python/buildout.cfg
../../component/pysvn-python/buildout.cfg
...
@@ -95,7 +96,6 @@ parts =
...
@@ -95,7 +96,6 @@ parts =
perl-DBI
perl-DBI
percona-toolkit
percona-toolkit
zabbix-agent
zabbix-agent
pdftk
dcron
dcron
dash
dash
wget
wget
...
@@ -142,7 +142,7 @@ parts =
...
@@ -142,7 +142,7 @@ parts =
[slapos.cookbook-repository]
[slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone
recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git
repository = http://git.erp5.org/repos/slapos.git
branch = erp5
-component
branch = erp5
git-executable = ${git:location}/bin/git
git-executable = ${git:location}/bin/git
[check-recipe]
[check-recipe]
...
@@ -197,7 +197,7 @@ extra-context =
...
@@ -197,7 +197,7 @@ extra-context =
[template-zope]
[template-zope]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-zope.cfg.in
url = ${:_profile_base_location_}/instance-zope.cfg.in
md5sum =
d5981dbe595004c707dd1744be1fe753
md5sum =
918b972679d5c06082363d41483324a7
mode = 640
mode = 640
[template-kumofs]
[template-kumofs]
...
@@ -214,7 +214,7 @@ extra-context =
...
@@ -214,7 +214,7 @@ extra-context =
[template-tidstorage]
[template-tidstorage]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-tidstorage.cfg.in
url = ${:_profile_base_location_}/instance-tidstorage.cfg.in
md5sum =
5e0c5de5bc17947c152de73b329a5a02
md5sum =
bd5872108f812c6823a8915670e51c4c
mode = 640
mode = 640
[template-cloudooo]
[template-cloudooo]
...
@@ -234,7 +234,7 @@ mode = 640
...
@@ -234,7 +234,7 @@ mode = 640
# XXX: "template.cfg" is hardcoded in instanciation recipe
# XXX: "template.cfg" is hardcoded in instanciation recipe
filename = template.cfg
filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in
template = ${:_profile_base_location_}/instance.cfg.in
md5sum =
bee6c2b640efee53e3b6e209127cb0bc
md5sum =
2576de300d1a74fd1a99388af9723d42
extra-context =
extra-context =
key apache_location apache:location
key apache_location apache:location
key aspell_location aspell:location
key aspell_location aspell:location
...
@@ -270,7 +270,6 @@ extra-context =
...
@@ -270,7 +270,6 @@ extra-context =
key logrotate_location logrotate:location
key logrotate_location logrotate:location
key mariadb_location mariadb:location
key mariadb_location mariadb:location
key openssl_location openssl:location
key openssl_location openssl:location
key pdftk_location pdftk:location
key poppler_location poppler:location
key poppler_location poppler:location
key sed_location sed:location
key sed_location sed:location
key template_cloudooo template-cloudooo:target
key template_cloudooo template-cloudooo:target
...
@@ -345,14 +344,15 @@ repository_id_list = erp5
...
@@ -345,14 +344,15 @@ repository_id_list = erp5
[erp5]
[erp5]
recipe = slapos.recipe.build:gitclone
recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/erp5.git
repository = http://git.erp5.org/repos/erp5.git
branch =
erp5-component
branch =
master
git-executable = ${git:location}/bin/git
git-executable = ${git:location}/bin/git
[fix-products-paths]
[fix-products-paths]
recipe = plone.recipe.command
recipe = plone.recipe.command
stop-on-error = true
stop-on-error = true
dir = ${erp5:location}
command =
command =
for DIR in "${erp5:location}"; do cd "$DIR"; rm -f Products ; ln -s product Products; touch product/__init__.py; done
rm -f "${:dir}/Products" && ln -s product "${:dir}/Products" && touch "${:dir}/product/__init__.py"
update-command = ${:command}
update-command = ${:command}
[testrunner]
[testrunner]
...
@@ -433,6 +433,7 @@ eggs =
...
@@ -433,6 +433,7 @@ eggs =
ordereddict
ordereddict
paramiko
paramiko
ply
ply
pyPdf # should be replaced by PyPDF2, but it is not installable
python-magic
python-magic
python-memcached
python-memcached
pytz
pytz
...
@@ -640,5 +641,6 @@ xml-marshaller = 0.9.7
...
@@ -640,5 +641,6 @@ xml-marshaller = 0.9.7
xupdate-processor = 0.4
xupdate-processor = 0.4
mr.developer = 1.21
mr.developer = 1.21
qrcode = 2.4.1
qrcode = 2.4.1
spyne = 2.9.3
requests = 0.13.2
requests = 0.13.2
cloudooo = 1.2.5-dev
cloudooo = 1.2.5-dev
stack/erp5/instance-tidstorage.cfg.in
View file @
469cd87e
...
@@ -134,7 +134,6 @@ link-binary =
...
@@ -134,7 +134,6 @@ link-binary =
{{ parameter_dict['imagemagick'] }}/bin/identify
{{ parameter_dict['imagemagick'] }}/bin/identify
{{ parameter_dict['mariadb'] }}/bin/mysql
{{ parameter_dict['mariadb'] }}/bin/mysql
{{ parameter_dict['mariadb'] }}/bin/mysqldump
{{ parameter_dict['mariadb'] }}/bin/mysqldump
{{ parameter_dict['pdftk'] }}/bin/pdftk
{{ parameter_dict['sed'] }}/bin/sed
{{ parameter_dict['sed'] }}/bin/sed
{{ parameter_dict['tesseract'] }}/bin/tesseract
{{ parameter_dict['tesseract'] }}/bin/tesseract
{{ parameter_dict['w3m'] }}/bin/w3m
{{ parameter_dict['w3m'] }}/bin/w3m
...
...
stack/erp5/instance-zope.cfg.in
View file @
469cd87e
...
@@ -196,7 +196,6 @@ link-binary =
...
@@ -196,7 +196,6 @@ link-binary =
{{ librsvg_location }}/bin/rsvg-convert
{{ librsvg_location }}/bin/rsvg-convert
{{ mariadb_location }}/bin/mysql
{{ mariadb_location }}/bin/mysql
{{ mariadb_location }}/bin/mysqldump
{{ mariadb_location }}/bin/mysqldump
{{ pdftk_location }}/bin/pdftk
{{ sed_location }}/bin/sed
{{ sed_location }}/bin/sed
{{ tesseract_location }}/bin/tesseract
{{ tesseract_location }}/bin/tesseract
{{ w3m_location }}/bin/w3m
{{ w3m_location }}/bin/w3m
...
...
stack/erp5/instance.cfg.in
View file @
469cd87e
...
@@ -39,7 +39,6 @@ grep = {{ grep_location }}
...
@@ -39,7 +39,6 @@ grep = {{ grep_location }}
imagemagick = {{ imagemagick_location }}
imagemagick = {{ imagemagick_location }}
librsvg = {{ librsvg_location }}
librsvg = {{ librsvg_location }}
mariadb = {{ mariadb_location }}
mariadb = {{ mariadb_location }}
pdftk = {{ pdftk_location }}
sed = {{ sed_location }}
sed = {{ sed_location }}
tesseract = {{ tesseract_location }}
tesseract = {{ tesseract_location }}
w3m = {{ w3m_location }}
w3m = {{ w3m_location }}
...
@@ -129,7 +128,6 @@ librsvg = {{ librsvg_location }}
...
@@ -129,7 +128,6 @@ librsvg = {{ librsvg_location }}
logrotate = {{ logrotate_location }}
logrotate = {{ logrotate_location }}
mariadb = {{ mariadb_location }}
mariadb = {{ mariadb_location }}
openssl = {{ openssl_location }}
openssl = {{ openssl_location }}
pdftk = {{ pdftk_location }}
poppler = {{ poppler_location }}
poppler = {{ poppler_location }}
sed = {{ sed_location }}
sed = {{ sed_location }}
tesseract = {{ tesseract_location }}
tesseract = {{ tesseract_location }}
...
@@ -159,7 +157,6 @@ extra-context =
...
@@ -159,7 +157,6 @@ extra-context =
key logrotate_location dynamic-template-zope-parameters:logrotate
key logrotate_location dynamic-template-zope-parameters:logrotate
key mariadb_location dynamic-template-zope-parameters:mariadb
key mariadb_location dynamic-template-zope-parameters:mariadb
key openssl_location dynamic-template-zope-parameters:openssl
key openssl_location dynamic-template-zope-parameters:openssl
key pdftk_location dynamic-template-zope-parameters:pdftk
key poppler_location dynamic-template-zope-parameters:poppler
key poppler_location dynamic-template-zope-parameters:poppler
key sed_location dynamic-template-zope-parameters:sed
key sed_location dynamic-template-zope-parameters:sed
key tesseract_location dynamic-template-zope-parameters:tesseract
key tesseract_location dynamic-template-zope-parameters:tesseract
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment