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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Iliya Manolov
slapos
Commits
acb4cab8
Commit
acb4cab8
authored
Nov 03, 2016
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Plain Diff
Update Release Candidate
parents
5e108950
068745a0
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
11 deletions
+24
-11
component/firewalld/buildout.cfg
component/firewalld/buildout.cfg
+4
-5
software/build-rina/build.cfg
software/build-rina/build.cfg
+3
-0
software/build-rina/runTestSuite.in
software/build-rina/runTestSuite.in
+1
-0
software/build-rina/software.cfg
software/build-rina/software.cfg
+10
-0
stack/slapos.cfg
stack/slapos.cfg
+6
-6
No files found.
component/firewalld/buildout.cfg
View file @
acb4cab8
[buildout]
[buildout]
parts =
parts =
firewalld-patch
firewalld-patch
...
@@ -44,13 +43,13 @@ environment =
...
@@ -44,13 +43,13 @@ environment =
[dbus-python]
[dbus-python]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
version = 1.2.
0
version = 1.2.
4
url = http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${:version}.tar.gz
url = http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${:version}.tar.gz
md5sum =
b09cd2d1a057cc432ce944de3fc06bf7
md5sum =
7372a588c83a7232b4e08159bfd48fe5
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
environment =
environment =
PKG_CONFIG_PATH=${dbus:location}/lib/pkgconfig:${dbus-glib:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
PKG_CONFIG_PATH=${dbus:location}/lib/pkgconfig:${dbus-glib:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
PATH=${pkgconfig:location}/bin:%(PATH)s
PATH=${pkgconfig:location}/bin:
${python2.7:location}/bin:
%(PATH)s
DBUS_CFLAGS=-I${dbus:location}/include/dbus-1.0 -I${dbus:location}/lib/dbus-1.0/include
DBUS_CFLAGS=-I${dbus:location}/include/dbus-1.0 -I${dbus:location}/lib/dbus-1.0/include
DBUS_LIBS=-L${dbus:location}/lib -ldbus-1
DBUS_LIBS=-L${dbus:location}/lib -ldbus-1
DBUS_GLIB_CFLAGS=-I${dbus-glib:location}/include/dbus-1.0
DBUS_GLIB_CFLAGS=-I${dbus-glib:location}/include/dbus-1.0
...
@@ -59,7 +58,7 @@ environment =
...
@@ -59,7 +58,7 @@ environment =
LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib
LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib
PYTHON=${python2.7:location}/bin/python2.7
PYTHON=${python2.7:location}/bin/python2.7
PYTHON_INCLUDES=-I${python2.7:location}/include/python2.7
PYTHON_INCLUDES=-I${python2.7:location}/include/python2.7
PYTHON_LIBS=-L${python2.7:location}/lib -lpython2.7
PYTHON_LIBS=-L${python2.7:location}/lib -lpython2.7
-lpthread -ldl -lutil -lm
[gobject-introspection]
[gobject-introspection]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
...
...
software/build-rina/build.cfg
View file @
acb4cab8
...
@@ -4,6 +4,7 @@ extends =
...
@@ -4,6 +4,7 @@ extends =
parts =
parts =
debuild-rina-tools
debuild-rina-tools
test-rina
test-rina
download-cache = download-cache
[vm-run-base]
[vm-run-base]
smp = 4
smp = 4
...
@@ -93,6 +94,7 @@ finalize =
...
@@ -93,6 +94,7 @@ finalize =
[test-rina]
[test-rina]
<= vm-run-base
<= vm-run-base
rina-tools-deps
rina-tools-deps
mount.download-cache = ${buildout:download-cache}
mount.rina = ${irati-stack:location}
mount.rina = ${irati-stack:location}
mount.slapos = ${:_profile_base_location_}/../..
mount.slapos = ${:_profile_base_location_}/../..
mount.slapos.package = ${slapos.package-repository:location}
mount.slapos.package = ${slapos.package-repository:location}
...
@@ -106,6 +108,7 @@ install =
...
@@ -106,6 +108,7 @@ install =
[buildout]
[buildout]
extends = /mnt/slapos/software/hellorina/software.cfg
extends = /mnt/slapos/software/hellorina/software.cfg
develop = /mnt/slapos
develop = /mnt/slapos
download-cache = /mnt/download-cache
[slapos-cookbook-develop]
[slapos-cookbook-develop]
recipe =
recipe =
setup =
setup =
...
...
software/build-rina/runTestSuite.in
View file @
acb4cab8
...
@@ -94,6 +94,7 @@ relative-paths = true
...
@@ -94,6 +94,7 @@ relative-paths = true
extends = {{parameter_dict['profile_base_location']}}/build.cfg
extends = {{parameter_dict['profile_base_location']}}/build.cfg
develop-eggs-directory = {{buildout['develop-eggs-directory']}}
develop-eggs-directory = {{buildout['develop-eggs-directory']}}
eggs-directory = {{buildout['eggs-directory']}}
eggs-directory = {{buildout['eggs-directory']}}
download-cache = {{parameter_dict['download-cache']}}
[vm-run-base]
[vm-run-base]
environment =
environment =
...
...
software/build-rina/software.cfg
View file @
acb4cab8
...
@@ -6,6 +6,11 @@ extends =
...
@@ -6,6 +6,11 @@ extends =
parts =
parts =
slapos-cookbook
slapos-cookbook
template
template
download-cache = download-cache
# Required for recent buildout.
extensions -=
buildout-versions
[template]
[template]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
...
@@ -38,6 +43,7 @@ template = inline:
...
@@ -38,6 +43,7 @@ template = inline:
[runTestSuite-parameters]
[runTestSuite-parameters]
environment = {{dumps(environment)}}
environment = {{dumps(environment)}}
vm = {{dumps(vm)}}
vm = {{dumps(vm)}}
download-cache = ${buildout:download-cache}
runTestSuite_py = ${buildout:bin-directory}/${runTestSuite_py:interpreter}
runTestSuite_py = ${buildout:bin-directory}/${runTestSuite_py:interpreter}
profile_base_location = ${:_profile_base_location_}
profile_base_location = ${:_profile_base_location_}
irati_stack = ${irati-stack:location}
irati_stack = ${irati-stack:location}
...
@@ -71,3 +77,7 @@ packages +=
...
@@ -71,3 +77,7 @@ packages +=
git ca-certificates python
git ca-certificates python
# biggest and common build-deps for RINA
# biggest and common build-deps for RINA
dh-autoreconf pkg-config doxygen maven xmlto
dh-autoreconf pkg-config doxygen maven xmlto
[versions]
zc.buildout = 2.5.2+slapos005
zc.recipe.egg = 2.0.3+slapos002
stack/slapos.cfg
View file @
acb4cab8
...
@@ -134,7 +134,7 @@ requests = 2.11.1
...
@@ -134,7 +134,7 @@ requests = 2.11.1
setuptools = 19.6.2
setuptools = 19.6.2
six = 1.10.0
six = 1.10.0
slapos.cookbook = 1.0.41
slapos.cookbook = 1.0.41
slapos.core = 1.3.1
7
slapos.core = 1.3.1
8
slapos.extension.strip = 0.1
slapos.extension.strip = 0.1
slapos.libnetworkcache = 0.14.5
slapos.libnetworkcache = 0.14.5
slapos.recipe.build = 0.27
slapos.recipe.build = 0.27
...
@@ -144,7 +144,7 @@ unicodecsv = 0.14.1
...
@@ -144,7 +144,7 @@ unicodecsv = 0.14.1
xml-marshaller = 0.9.7
xml-marshaller = 0.9.7
# Required by:
# Required by:
# slapos.core==1.3.1
7
# slapos.core==1.3.1
8
Flask = 0.11.1
Flask = 0.11.1
# Required by:
# Required by:
...
@@ -172,7 +172,7 @@ jsonschema = 2.5.1
...
@@ -172,7 +172,7 @@ jsonschema = 2.5.1
lock-file = 2.0
lock-file = 2.0
# Required by:
# Required by:
# slapos.core==1.3.1
5
# slapos.core==1.3.1
8
# XXX 'slapos node format' raises an exception with netifaces 0.10.5.
# XXX 'slapos node format' raises an exception with netifaces 0.10.5.
netifaces = 0.10.4
netifaces = 0.10.4
...
@@ -181,15 +181,15 @@ netifaces = 0.10.4
...
@@ -181,15 +181,15 @@ netifaces = 0.10.4
pycparser = 2.14
pycparser = 2.14
# Required by:
# Required by:
# slapos.core==1.3.1
5
# slapos.core==1.3.1
8
supervisor = 3.3.1
supervisor = 3.3.1
# Required by:
# Required by:
# slapos.core==1.3.1
5
# slapos.core==1.3.1
8
uritemplate = 3.0.0
uritemplate = 3.0.0
# Required by:
# Required by:
# slapos.core==1.3.1
5
# slapos.core==1.3.1
8
zope.interface = 4.2.0
zope.interface = 4.2.0
[networkcache]
[networkcache]
...
...
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