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
Klaus Wölfel
slapos
Commits
5e108950
Commit
5e108950
authored
Nov 02, 2016
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Plain Diff
Update Relaese Candidate
parents
f72097e1
27ccd773
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
41 additions
and
91 deletions
+41
-91
component/dbus/buildout.cfg
component/dbus/buildout.cfg
+2
-2
component/leptonica/buildout.cfg
component/leptonica/buildout.cfg
+2
-5
component/leptonica/leptonica-1.69-zlib-include.patch
component/leptonica/leptonica-1.69-zlib-include.patch
+0
-22
component/slapos/buildout.cfg
component/slapos/buildout.cfg
+1
-1
component/tesseract/buildout.cfg
component/tesseract/buildout.cfg
+2
-7
component/tesseract/tesseract-3.00-gcc-4.7-build.patch
component/tesseract/tesseract-3.00-gcc-4.7-build.patch
+0
-10
component/tesseract/tesseract-3.01-remove-bom.patch
component/tesseract/tesseract-3.01-remove-bom.patch
+0
-15
component/vm-img/debian.cfg
component/vm-img/debian.cfg
+1
-1
setup.py
setup.py
+1
-1
software/apache-frontend/common.cfg
software/apache-frontend/common.cfg
+1
-1
software/apache-frontend/templates/apache_cached.conf.in
software/apache-frontend/templates/apache_cached.conf.in
+1
-0
software/build-rina/build.cfg
software/build-rina/build.cfg
+16
-19
software/build-rina/runTestSuite.in
software/build-rina/runTestSuite.in
+9
-2
software/build-rina/software.cfg
software/build-rina/software.cfg
+1
-1
software/erp5testnode/software.cfg
software/erp5testnode/software.cfg
+1
-1
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+1
-1
software/test-slave-instance-deployment/software.cfg
software/test-slave-instance-deployment/software.cfg
+1
-1
stack/slapos.cfg
stack/slapos.cfg
+1
-1
No files found.
component/dbus/buildout.cfg
View file @
5e108950
...
@@ -10,8 +10,8 @@ parts =
...
@@ -10,8 +10,8 @@ parts =
[dbus]
[dbus]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
url = http://dbus.freedesktop.org/releases/dbus/dbus-1.
8.1
6.tar.gz
url = http://dbus.freedesktop.org/releases/dbus/dbus-1.
11.
6.tar.gz
md5sum =
020824a38850501e7d6ba8307a7c5ac3
md5sum =
fdb03ad2f2861a171fe7d0caad3b415f
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
configure-options =
configure-options =
--disable-static
--disable-static
...
...
component/leptonica/buildout.cfg
View file @
5e108950
...
@@ -11,13 +11,10 @@ extends =
...
@@ -11,13 +11,10 @@ extends =
[leptonica]
[leptonica]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
url = http://
leptonica.googlecode.com/files/leptonica-1.68
.tar.gz
url = http://
www.leptonica.org/source/leptonica-1.73
.tar.gz
md5sum =
5cd7092f9ff2ca7e3f3e73bfcd556403
md5sum =
092cea2e568cada79fff178820397922
configure-options =
configure-options =
--disable-static
--disable-static
patch-options = -p1
patches =
${:_profile_base_location_}/leptonica-1.69-zlib-include.patch#cff3dc942075190939b407c38e0d3201
environment =
environment =
CPPFLAGS=-I${zlib:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libtiff:location}/include -I${webp:location}/include -I${giflib:location}/include
CPPFLAGS=-I${zlib:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libtiff:location}/include -I${webp:location}/include -I${giflib:location}/include
LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${webp:location}/lib -Wl,-rpath=${webp:location}/lib -L${giflib:location}/lib -Wl,-rpath=${giflib:location}/lib
LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${webp:location}/lib -Wl,-rpath=${webp:location}/lib -L${giflib:location}/lib -Wl,-rpath=${giflib:location}/lib
...
...
component/leptonica/leptonica-1.69-zlib-include.patch
deleted
100644 → 0
View file @
f72097e1
This patch is originally taken from:
http://leptonica.googlecode.com/issues/attachment?aid=560001000&name=zlib-include.patch&token=m2sugSYxB4xwAuNgrKXyHTxBYNg%3A1337345966091
To fix the following issue with leptonica:
http://code.google.com/p/leptonica/issues/detail?id=56
diff -Nurd -x'*~' leptonica-1.68.orig/src/pngio.c leptonica-1.68/src/pngio.c
--- leptonica-1.68.orig/src/pngio.c 2011-02-01 00:41:12.000000000 -0500
+++ leptonica-1.68/src/pngio.c 2011-07-09 09:17:17.000000000 -0400
@@ -108,6 +108,10 @@
#include "png.h"
+#ifdef HAVE_LIBZ
+#include "zlib.h"
+#endif
+
/* ----------------Set defaults for read/write options ----------------- */
/* strip 16 bpp --> 8 bpp on reading png; default is for stripping */
static l_int32 var_PNG_STRIP_16_TO_8 = 1;
component/slapos/buildout.cfg
View file @
5e108950
...
@@ -133,5 +133,5 @@ scripts = py
...
@@ -133,5 +133,5 @@ scripts = py
[versions]
[versions]
setuptools = 19.6.2
setuptools = 19.6.2
slapos.rebootstrap = 3.7
slapos.rebootstrap = 3.7
zc.buildout = 2.5.2+slapos00
3
zc.buildout = 2.5.2+slapos00
5
zc.recipe.egg = 2.0.3+slapos002
zc.recipe.egg = 2.0.3+slapos002
component/tesseract/buildout.cfg
View file @
5e108950
...
@@ -14,13 +14,8 @@ parts =
...
@@ -14,13 +14,8 @@ parts =
[tesseract]
[tesseract]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
url = http://tesseract-ocr.googlecode.com/files/tesseract-3.01.tar.gz
url = https://github.com/tesseract-ocr/tesseract/archive/3.04.01.tar.gz
md5sum = 1ba496e51a42358fb9d3ffe781b2d20a
md5sum = 645a21effcf2825a3473849d72a7fd90
patch-options =
-p1
patches =
${:_profile_base_location_}/tesseract-3.00-gcc-4.7-build.patch#ca80db3ec489c547b03f3ee48879c1b1
${:_profile_base_location_}/tesseract-3.01-remove-bom.patch#2e691858cb492b7c17d23bf0912b3d24
pre-configure =
pre-configure =
libtoolize -f -c
libtoolize -f -c
aclocal -I ${libtool:location}/share/aclocal -I config
aclocal -I ${libtool:location}/share/aclocal -I config
...
...
component/tesseract/tesseract-3.00-gcc-4.7-build.patch
deleted
100644 → 0
View file @
f72097e1
--- tesseract-3.00/viewer/svutil.cpp.old 2012-04-11 09:34:26.168608940 +0200
+++ tesseract-3.00/viewer/svutil.cpp 2012-04-11 09:34:46.108565692 +0200
@@ -21,6 +21,7 @@
// thread/process creation & synchronization and network connection.
#include <stdio.h>
+#include <unistd.h>
#ifdef WIN32
#include <windows.h>
#include <winsock.h>
component/tesseract/tesseract-3.01-remove-bom.patch
deleted
100644 → 0
View file @
f72097e1
The patch below removes a utf-8 BOM mark.
Avoid touching it as the BOM is invisible, and copy/pasting might not work.
It is needed because old compilers treat the BOM as garbage instead of
whitespace.
--- tesseract-3.01/ccutil/strngs.h.orig 2012-05-24 15:13:22.743808379 +0200
+++ tesseract-3.01/ccutil/strngs.h 2012-05-24 15:16:54.468858282 +0200
@@ -1,4 +1,4 @@
-/**********************************************************************
+/**********************************************************************
* File: strngs.h (Formerly strings.h)
* Description: STRING class definition.
* Author: Ray Smith
component/vm-img/debian.cfg
View file @
5e108950
...
@@ -35,7 +35,7 @@ debconf.debconf =
...
@@ -35,7 +35,7 @@ debconf.debconf =
# minimal size
# minimal size
preseed.recommends = false
preseed.recommends = false
preseed.tasks =
preseed.tasks =
packages = localepurge
ssh
packages = localepurge
[debian-jessie]
[debian-jessie]
x86_64.iso = debian-amd64-netinst.iso
x86_64.iso = debian-amd64-netinst.iso
...
...
setup.py
View file @
5e108950
...
@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
...
@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
import
glob
import
glob
import
os
import
os
version
=
'1.0.4
1
'
version
=
'1.0.4
2.dev0
'
name
=
'slapos.cookbook'
name
=
'slapos.cookbook'
long_description
=
open
(
"README.rst"
).
read
()
+
"
\
n
"
+
\
long_description
=
open
(
"README.rst"
).
read
()
+
"
\
n
"
+
\
open
(
"CHANGES.rst"
).
read
()
+
"
\
n
"
open
(
"CHANGES.rst"
).
read
()
+
"
\
n
"
...
...
software/apache-frontend/common.cfg
View file @
5e108950
...
@@ -121,7 +121,7 @@ mode = 640
...
@@ -121,7 +121,7 @@ mode = 640
[template-apache-cached-configuration]
[template-apache-cached-configuration]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/templates/apache_cached.conf.in
url = ${:_profile_base_location_}/templates/apache_cached.conf.in
md5sum =
2c6c09390a9d778aecba75f569fb486c
md5sum =
86dcbdc0874d3c1b8971b76b70c4df65
mode = 640
mode = 640
[template-rewrite-cached]
[template-rewrite-cached]
...
...
software/apache-frontend/templates/apache_cached.conf.in
View file @
5e108950
...
@@ -119,6 +119,7 @@ SSLProxyCheckPeerCN off
...
@@ -119,6 +119,7 @@ SSLProxyCheckPeerCN off
SSLProxyCheckPeerExpire off
SSLProxyCheckPeerExpire off
NameVirtualHost *:{{ cached_port }}
NameVirtualHost *:{{ cached_port }}
NameVirtualHost *:{{ ssl_cached_port }}
include {{ slave_with_cache_configuration_directory }}/*.conf
include {{ slave_with_cache_configuration_directory }}/*.conf
...
...
software/build-rina/build.cfg
View file @
5e108950
...
@@ -13,15 +13,15 @@ apt-sources =
...
@@ -13,15 +13,15 @@ apt-sources =
apt-update =
apt-update =
for x in ${:apt-sources}
for x in ${:apt-sources}
do echo deb [trusted=yes] file:`map $x` ./
do echo deb [trusted=yes] file:`map $x` ./
done >>/etc/apt/sources.list
done
|sudo sh -c "cat
>>/etc/apt/sources.list
apt-get update
apt-get update
"
[debuild-rina-base]
[debuild-rina-base]
<= vm-run-base
<= vm-run-base
mount.rina = ${irati-stack:location}
mount.rina = ${irati-stack:location}
cd-source =
cd-source =
git clone -snc core.sparseCheckout=true /mnt/rina
/
rina
git clone -snc core.sparseCheckout=true /mnt/rina rina
cd
/
rina
cd rina
echo /${:component} > .git/info/sparse-checkout
echo /${:component} > .git/info/sparse-checkout
git reset --hard
git reset --hard
cd ${:component}
cd ${:component}
...
@@ -32,7 +32,7 @@ cd-source =
...
@@ -32,7 +32,7 @@ cd-source =
[ "$dist" ] && dist=`lsb_release -sc`/$dist || dist=UNRELEASED
[ "$dist" ] && dist=`lsb_release -sc`/$dist || dist=UNRELEASED
prepare =
prepare =
build-deps =
build-deps =
mk-build-deps -irt 'apt-get -y'
mk-build-deps -ir
s sudo -
t 'apt-get -y'
build =
build =
dpkg-buildpackage -uc -b -jauto
dpkg-buildpackage -uc -b -jauto
finalize =
finalize =
...
@@ -57,12 +57,12 @@ command =
...
@@ -57,12 +57,12 @@ command =
component = linux
component = linux
prepare =
prepare =
debian/dch-snapshot --force-distribution -D $dist
debian/dch-snapshot --force-distribution -D $dist
apt-get -y install kernel-wedge quilt python-six
sudo
apt-get -y install kernel-wedge quilt python-six
QUILT_PATCHES=$PWD/debian/patches QUILT_PC=.pc quilt push --quiltrc - -a -q --fuzz=0
QUILT_PATCHES=$PWD/debian/patches QUILT_PC=.pc quilt push --quiltrc - -a -q --fuzz=0
debian/rules debian/rules.gen || :
debian/rules debian/rules.gen || :
build =
build =
arch=`dpkg-architecture -qDEB_HOST_ARCH`
arch=`dpkg-architecture -qDEB_HOST_ARCH`
make -j${:smp} -f debian/rules.gen binary-arch_$${arch}_none binary-libc-dev_$${arch}
fakeroot
make -j${:smp} -f debian/rules.gen binary-arch_$${arch}_none binary-libc-dev_$${arch}
dpkg-genchanges -b -UBinary -UDescription \
dpkg-genchanges -b -UBinary -UDescription \
>../linux_`dpkg-parsechangelog -S Version`_$${arch}.changes
>../linux_`dpkg-parsechangelog -S Version`_$${arch}.changes
...
@@ -87,7 +87,7 @@ apt-sources = ${debuild-librina:location} ${debuild-rinad:location}
...
@@ -87,7 +87,7 @@ apt-sources = ${debuild-librina:location} ${debuild-rinad:location}
component = rina-tools
component = rina-tools
# check that the built packages install
# check that the built packages install
finalize =
finalize =
dpkg -i ../*.deb
sudo
dpkg -i ../*.deb
${debuild-librina:finalize}
${debuild-librina:finalize}
[test-rina]
[test-rina]
...
@@ -99,10 +99,9 @@ mount.slapos.package = ${slapos.package-repository:location}
...
@@ -99,10 +99,9 @@ mount.slapos.package = ${slapos.package-repository:location}
commands = install test
commands = install test
install =
install =
${:apt-update}
${:apt-update}
apt-get -y install librinad-dev rinad
sudo apt-get -y install librinad-dev rinad
: || {
mkdir software
mkdir rina-tools
cd software
cd rina-tools
cat <<EOF >buildout.cfg
cat <<EOF >buildout.cfg
[buildout]
[buildout]
extends = /mnt/slapos/software/hellorina/software.cfg
extends = /mnt/slapos/software/hellorina/software.cfg
...
@@ -112,18 +111,16 @@ install =
...
@@ -112,18 +111,16 @@ install =
setup =
setup =
[irati-stack]
[irati-stack]
repository = /mnt/rina
repository = /mnt/rina
shared = true
[versions]
[versions]
slapos.cookbook =
slapos.cookbook =
EOF
EOF
sed s,${buildout:directory}/,/mnt/buildout/, /mnt/buildout/bin/buildout |
MAKEFLAGS=-j${:smp} python -S /mnt/buildout/bin/buildout
python - bootstrap
MAKEFLAGS=-j${:smp} bin/buildout
}
/mnt/slapos.package/playbook/roles/rina/gen-ipcm-conf
systemctl enable ipcm-re6st
arch=`dpkg-architecture -qDEB_HOST_ARCH`
arch=`dpkg-architecture -qDEB_HOST_ARCH`
dpkg -i `map ${debuild-rina-kernel:location}`/linux-image-*-$${arch}_*.deb
sudo sh -c "/mnt/slapos.package/playbook/roles/rina/gen-ipcm-conf
systemctl enable ipcm-re6st
dpkg -i `map ${debuild-rina-kernel:location}`/linux-image-*-$${arch}_*.deb"
reboot
reboot
test = ( set -x
test = ( set -x
# TODO: more tests
# TODO: more tests
...
...
software/build-rina/runTestSuite.in
View file @
5e108950
...
@@ -6,6 +6,7 @@ from time import gmtime, strftime, time
...
@@ -6,6 +6,7 @@ from time import gmtime, strftime, time
# What we do here is currently too new to reuse more from testsuite.
# What we do here is currently too new to reuse more from testsuite.
from erp5.util import taskdistribution
from erp5.util import taskdistribution
from erp5.util.testsuite import format_command
from erp5.util.testsuite import format_command
from zc.buildout.buildout import Buildout
{% set vm = parameter_dict['vm'] -%}
{% set vm = parameter_dict['vm'] -%}
...
@@ -79,12 +80,18 @@ def main():
...
@@ -79,12 +80,18 @@ def main():
else:
else:
test_result = DummyTestResult(dist_list)
test_result = DummyTestResult(dist_list)
Buildout._setup_logging = lambda self: None
fd = os.open('buildout.cfg', os.O_CREAT | os.O_EXCL | os.O_WRONLY, 0666)
fd = os.open('buildout.cfg', os.O_CREAT | os.O_EXCL | os.O_WRONLY, 0666)
try:
try:
os.write(fd, """\
os.write(fd, """\
[buildout]
[buildout]
extends = {{parameter_dict['profile_base_location']}}/build.cfg
offline = true
offline = true
relative-paths = true
""")
Buildout('buildout.cfg', {}).bootstrap(None)
os.write(fd, """\
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']}}
...
@@ -109,7 +116,7 @@ location = {{parameter_dict['slapos_package']}}
...
@@ -109,7 +116,7 @@ location = {{parameter_dict['slapos_package']}}
break
break
dist = test_result_line.name
dist = test_result_line.name
cmd = [
{{repr(parameter_dict['buildout'])}}
,
cmd = [
os.path.join('bin', 'buildout')
,
'vm-run-base:dist=' + dist,
'vm-run-base:dist=' + dist,
'debuild-rina-base:suite=' + (publish['suite'] if publish else ''),
'debuild-rina-base:suite=' + (publish['suite'] if publish else ''),
]
]
...
...
software/build-rina/software.cfg
View file @
5e108950
...
@@ -39,7 +39,6 @@ template = inline:
...
@@ -39,7 +39,6 @@ template = inline:
environment = {{dumps(environment)}}
environment = {{dumps(environment)}}
vm = {{dumps(vm)}}
vm = {{dumps(vm)}}
runTestSuite_py = ${buildout:bin-directory}/${runTestSuite_py:interpreter}
runTestSuite_py = ${buildout:bin-directory}/${runTestSuite_py:interpreter}
buildout = ${buildout:bin-directory}/buildout
profile_base_location = ${:_profile_base_location_}
profile_base_location = ${:_profile_base_location_}
irati_stack = ${irati-stack:location}
irati_stack = ${irati-stack:location}
slapos_package = ${slapos.package-repository:location}
slapos_package = ${slapos.package-repository:location}
...
@@ -50,6 +49,7 @@ context =
...
@@ -50,6 +49,7 @@ context =
[runTestSuite_py]
[runTestSuite_py]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
eggs = erp5.util
eggs = erp5.util
zc.buildout
interpreter = ${:_buildout_section_name_}
interpreter = ${:_buildout_section_name_}
[irati-stack]
[irati-stack]
...
...
software/erp5testnode/software.cfg
View file @
5e108950
...
@@ -68,5 +68,5 @@ PyXML = 0.8.5
...
@@ -68,5 +68,5 @@ PyXML = 0.8.5
erp5.util = 0.4.46
erp5.util = 0.4.46
slapos.recipe.template = 2.7
slapos.recipe.template = 2.7
setuptools = 19.6.2
setuptools = 19.6.2
zc.buildout = 2.5.2+slapos00
3
zc.buildout = 2.5.2+slapos00
5
zc.recipe.egg = 2.0.3+slapos002
zc.recipe.egg = 2.0.3+slapos002
software/slaprunner/common.cfg
View file @
5e108950
...
@@ -232,5 +232,5 @@ eggs +=
...
@@ -232,5 +232,5 @@ eggs +=
supervisor
supervisor
[versions]
[versions]
zc.buildout = 2.5.2+slapos00
3
zc.buildout = 2.5.2+slapos00
5
zc.recipe.egg = 2.0.3+slapos002
zc.recipe.egg = 2.0.3+slapos002
software/test-slave-instance-deployment/software.cfg
View file @
5e108950
...
@@ -58,7 +58,7 @@ eggs = collective.recipe.template
...
@@ -58,7 +58,7 @@ eggs = collective.recipe.template
[versions]
[versions]
collective.recipe.template = 1.11
collective.recipe.template = 1.11
plone.recipe.command = 1.1
plone.recipe.command = 1.1
slapos.recipe.build = 0.2
5
slapos.recipe.build = 0.2
7
slapos.recipe.template = 2.7
slapos.recipe.template = 2.7
# Replicate slapos stack, but without shacache to not have to compile the entire world for a simple test.
# Replicate slapos stack, but without shacache to not have to compile the entire world for a simple test.
...
...
stack/slapos.cfg
View file @
5e108950
...
@@ -137,7 +137,7 @@ slapos.cookbook = 1.0.41
...
@@ -137,7 +137,7 @@ slapos.cookbook = 1.0.41
slapos.core = 1.3.17
slapos.core = 1.3.17
slapos.extension.strip = 0.1
slapos.extension.strip = 0.1
slapos.libnetworkcache = 0.14.5
slapos.libnetworkcache = 0.14.5
slapos.recipe.build = 0.2
5
slapos.recipe.build = 0.2
7
slapos.recipe.cmmi = 0.2
slapos.recipe.cmmi = 0.2
stevedore = 1.17.1
stevedore = 1.17.1
unicodecsv = 0.14.1
unicodecsv = 0.14.1
...
...
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