From ec07d87bdd09f14bf96713d7c4c7fe0ccaf7028d Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki Date: Tue, 29 Jul 2014 08:13:27 +0900 Subject: [PATCH] clean up kumofs and messagepack, by dropping erp5.recipe.cmmiforcei686. --- component/kumo/buildout.cfg | 29 ++++------------------------- component/messagepack/buildout.cfg | 2 +- software/kumofs/software.cfg | 2 -- stack/erp5/buildout.cfg | 5 ----- 4 files changed, 5 insertions(+), 33 deletions(-) diff --git a/component/kumo/buildout.cfg b/component/kumo/buildout.cfg index 5c648f1..dc79b63 100644 --- a/component/kumo/buildout.cfg +++ b/component/kumo/buildout.cfg @@ -8,35 +8,14 @@ extends = parts = kumo find-links = http://www.nexedi.org/static/packages/source/ -[kumo-hooks-download] -url = ${:_profile_base_location_}/${:filename} -md5sum = 958a595a02de75624728f8d65e39d800 -recipe = hexagonit.recipe.download -download-only=true -filename = kumo-hooks.py - -[kumo-ipv6-multiip-patch-download] -recipe = hexagonit.recipe.download -url = ${:_profile_base_location_}/${:filename} -filename = kumofs-0.4.13_ipv6support_multiiplistenfix.patch -md5sum = 53af9f1f1375940841c589a6cbe11425 -download-only = true - -[kumo-gcc-4.9-ftbfs-download] -recipe = hexagonit.recipe.download -url = ${:_profile_base_location_}/${:filename} -filename = kumofs-0.4.13_fix_gcc-4.9_ftbfs.patch -md5sum = c09e04c620ce11c3fdd4afc3459cd355 -download-only = true - [kumo] -pre-configure-hook = ${kumo-hooks-download:location}/${kumo-hooks-download:filename}:pre_configure_hook -recipe = erp5.recipe.cmmiforcei686 +recipe = slapos.recipe.cmmi url = https://github.com/downloads/etolabo/kumofs/kumofs-0.4.13.tar.gz md5sum = 46148e9536222d0ad2ef36777c55714d +pre-configure-hook = ${:_profile_base_location_}/kumo-hooks.py#958a595a02de75624728f8d65e39d800:pre_configure_hook patches = - ${kumo-ipv6-multiip-patch-download:location}/${kumo-ipv6-multiip-patch-download:filename} - ${kumo-gcc-4.9-ftbfs-download:location}/${kumo-gcc-4.9-ftbfs-download:filename} + ${:_profile_base_location_}/kumofs-0.4.13_ipv6support_multiiplistenfix.patch#53af9f1f1375940841c589a6cbe11425 + ${:_profile_base_location_}/kumofs-0.4.13_fix_gcc-4.9_ftbfs.patch#c09e04c620ce11c3fdd4afc3459cd355 patch-options = -p1 configure-options = --enable-tcadb diff --git a/component/messagepack/buildout.cfg b/component/messagepack/buildout.cfg index 7802ca7..787b999 100644 --- a/component/messagepack/buildout.cfg +++ b/component/messagepack/buildout.cfg @@ -3,7 +3,7 @@ parts = messagepack find-links = http://www.nexedi.org/static/packages/source/ [messagepack] -recipe = erp5.recipe.cmmiforcei686 +recipe = slapos.recipe.cmmi url = http://downloads.sourceforge.net/project/msgpack/msgpack/cpp/msgpack-0.5.4.tar.gz md5sum = 18d96a3178f7cad73c0ca44f6284ae7d configure-options = diff --git a/software/kumofs/software.cfg b/software/kumofs/software.cfg index f574c8b..63977c7 100644 --- a/software/kumofs/software.cfg +++ b/software/kumofs/software.cfg @@ -76,8 +76,6 @@ signature-certificate-list = Jinja2 = 2.6 Werkzeug = 0.8.3 buildout-versions = 1.7 - erp5.recipe.cmmiforcei686 = 0.1.3 - hexagonit.recipe.cmmi = 1.6 meld3 = 0.6.10 rdiff-backup = 1.0.5 slapos.cookbook = 0.71.1 diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg index a972059..f28af96 100644 --- a/stack/erp5/buildout.cfg +++ b/stack/erp5/buildout.cfg @@ -644,7 +644,6 @@ chardet = 2.2.1 cmd2 = 0.6.7 csp-eventlet = 0.7.0 elementtree = 1.2.7-20070827-preview -erp5.recipe.cmmiforcei686 = 0.1.3 erp5diff = 0.8.1.5 eventlet = 0.15.0 five.formlib = 1.0.4 @@ -733,10 +732,6 @@ feedparser = 5.1.3 fpconst = 0.7.2 # Required by: -# erp5.recipe.cmmiforcei686==0.1.3 -hexagonit.recipe.cmmi = 2.0 - -# Required by: # minitage.recipe.egg==1.107 iniparse = 0.4 -- 2.1.4