Commit 47a68bf7 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki Committed by Alain Takoudjou

fixup! add firewalld component

Conflicts:
	stack/slapos.cfg
parent eeb3cdec
...@@ -24,10 +24,10 @@ recipe = slapos.recipe.cmmi ...@@ -24,10 +24,10 @@ recipe = slapos.recipe.cmmi
url = https://github.com/t-woerner/firewalld/archive/v0.3.14.2.tar.gz url = https://github.com/t-woerner/firewalld/archive/v0.3.14.2.tar.gz
md5sum = b8f81b536ede502721f69300d374447b md5sum = b8f81b536ede502721f69300d374447b
python-egg = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/python2.7/site-packages python-egg = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/python2.7/site-packages
configure-command = pre-configure =
sed -i -E 's,(^SUBDIRS *=.*) doc(\b.*),\1\2,' Makefile.am
aclocal -I${pkgconfig:location}/share/aclocal -I${gettext:location}/share/aclocal -I${libtool:location}/share/aclocal aclocal -I${pkgconfig:location}/share/aclocal -I${gettext:location}/share/aclocal -I${libtool:location}/share/aclocal
./autogen.sh ./autogen.sh
sed -i "s#SUBDIRS = config doc po shell-completion src#SUBDIRS = config po shell-completion src#" Makefile
environment = environment =
PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig
...@@ -62,7 +62,7 @@ environment = ...@@ -62,7 +62,7 @@ environment =
[gobject-introspection] [gobject-introspection]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://github.com/GNOME/gobject-introspection/archive/GOBJECT_INTROSPECTION_1_45_2.tar.gz url = https://github.com/GNOME/gobject-introspection/archive/GOBJECT_INTROSPECTION_1_45_2.tar.gz
configure-command = pre-configure =
libtoolize -c -f libtoolize -c -f
aclocal -I${pkgconfig:location}/share/aclocal -I${gettext:location}/share/aclocal -I${libtool:location}/share/aclocal aclocal -I${pkgconfig:location}/share/aclocal -I${gettext:location}/share/aclocal -I${libtool:location}/share/aclocal
./autogen.sh ./autogen.sh
...@@ -86,12 +86,10 @@ environment = ...@@ -86,12 +86,10 @@ environment =
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.10/pygobject-3.10.2.tar.xz url = http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.10/pygobject-3.10.2.tar.xz
python-egg = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/python2.7/site-packages python-egg = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/python2.7/site-packages
# md5sum = md5sum = f311155be8510df6ad8e4edf1cb463d4
configure-command = pre-configure =
sed -i 's#/usr/local#${gobject-introspection:location}#g' ${gobject-introspection:location}/lib/pkgconfig/gobject-introspection-1.0.pc sed -i 's#/usr/local#${gobject-introspection:location}#g' ${gobject-introspection:location}/lib/pkgconfig/gobject-introspection-1.0.pc
./configure
configure-options = configure-options =
--prefix=${buildout:parts-directory}/${:_buildout_section_name_}
--disable-static --disable-static
--disable-cairo --disable-cairo
--with-python=${python2.7:location}/bin/python2.7 --with-python=${python2.7:location}/bin/python2.7
......
...@@ -116,14 +116,16 @@ buildout-versions = 1.7 ...@@ -116,14 +116,16 @@ buildout-versions = 1.7
cffi = 1.1.2 cffi = 1.1.2
cmd2 = 0.6.8 cmd2 = 0.6.8
collective.recipe.template = 1.11 collective.recipe.template = 1.11
cryptography = 0.9.3 cryptography = 1.0.2
decorator = 4.0.4
idna = 2.0
inotifyx = 0.2.2 inotifyx = 0.2.2
itsdangerous = 0.24 itsdangerous = 0.24
lxml = 3.4.4 lxml = 3.4.4
meld3 = 1.0.2 meld3 = 1.0.2
mr.developer = 1.33 netaddr = 0.7.18
netaddr = 0.7.15 pbr = 1.8.1
pbr = 1.3.0 plone.recipe.command = 1.1
prettytable = 0.7.2 prettytable = 0.7.2
psutil = 3.1.1 psutil = 3.1.1
pyOpenSSL = 0.15.1 pyOpenSSL = 0.15.1
...@@ -144,7 +146,7 @@ xml-marshaller = 0.9.7 ...@@ -144,7 +146,7 @@ xml-marshaller = 0.9.7
z3c.recipe.scripts = 1.0.1 z3c.recipe.scripts = 1.0.1
# Required by: # Required by:
# slapos.core==1.3.10 # slapos.core==1.3.12
Flask = 0.10.1 Flask = 0.10.1
# Required by: # Required by:
...@@ -181,7 +183,7 @@ jsonschema = 2.5.1 ...@@ -181,7 +183,7 @@ jsonschema = 2.5.1
lock-file = 2.0 lock-file = 2.0
# Required by: # Required by:
# slapos.core==1.3.10 # slapos.core==1.3.12
netifaces = 0.10.4 netifaces = 0.10.4
# Required by: # Required by:
...@@ -193,16 +195,16 @@ pyasn1 = 0.1.8 ...@@ -193,16 +195,16 @@ pyasn1 = 0.1.8
pycparser = 2.14 pycparser = 2.14
# Required by: # Required by:
# slapos.core==1.3.10 # slapos.core==1.3.12
supervisor = 3.1.3 supervisor = 3.1.3
# Required by: # Required by:
# slapos.core==1.3.10 # slapos.core==1.3.12
uritemplate = 0.6 uritemplate = 0.6
# Required by: # Required by:
# slapos.core==1.3.10 # slapos.core==1.3.12
zope.interface = 4.1.2 zope.interface = 4.1.3
[networkcache] [networkcache]
download-cache-url = http://www.shacache.org/shacache download-cache-url = http://www.shacache.org/shacache
......
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