Commit 8709ea90 authored by Rafael Monnerat's avatar Rafael Monnerat

Merge branch 'master' into no_tapvpn

parents a9481f4b 11ff5be4
!/bin/sh -e #!/bin/sh -e
# This Script automates the the setup of SLAPOS Servers with # This Script automates the the setup of SLAPOS Servers with
# Essential information. # Essential information.
...@@ -59,7 +59,7 @@ IPV6WAITTIME=5 ...@@ -59,7 +59,7 @@ IPV6WAITTIME=5
# Wait for native ipv6 connection to be ready # Wait for native ipv6 connection to be ready
i=0 i=0
ping6 -c 2 ipv6.google.com ping6 -c 2 ipv6.google.com
while [[ $? != 0 ]] && [[ $i < $IPV6WAITTIME ]] while [ $? != 0 ] && [ $i < $IPV6WAITTIME ]
do do
let i++ let i++
sleep 1 sleep 1
......
#!/bin/bash -e #!/bin/sh -e
VERSION=0.35 # Edit for release
RECIPE_VERSION=0.148 VERSION=1.0
RELEASE=2 # Edit for release
RECIPE_VERSION=0.203
# Edit for release
RELEASE=3
VERSION_REGEX="s/\%RECIPE_VERSION\%/$RECIPE_VERSION/g;s/\%VERSION\%/$VERSION/g;s/\%RELEASE\%/$RELEASE/g" # Define URL to compile
#BUILDOUT_URL=http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-$RECIPE_VERSION:/component/slapos/buildout.cfg
# Development version of the build
BUILDOUT_URL=http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/slapos:/component/slapos/buildout.cfg
VERSION_REGEX="s!\%BUILDOUT_URL\%!$BUILDOUT_URL!g;s/\%RECIPE_VERSION\%/$RECIPE_VERSION/g;s/\%VERSION\%/$VERSION/g;s/\%RELEASE\%/$RELEASE/g"
CURRENT_DIRECTORY="$(pwd)" CURRENT_DIRECTORY="$(pwd)"
TEMPLATES_DIRECTORY=$CURRENT_DIRECTORY/templates TEMPLATES_DIRECTORY=$CURRENT_DIRECTORY/templates
SLAPOS_ORGINAL_DIRECTORY=slapos-node SLAPOS_ORGINAL_DIRECTORY=slapos-node
SLAPOS_DIRECTORY=slapos-node_$VERSION+$RECIPE_VERSION+$RELEASE SLAPOS_DIRECTORY=slapos-node_$VERSION+$RECIPE_VERSION+$RELEASE
# Edit for release
# Stable one
#OBS_DIRECTORY=$CURRENT_DIRECTORY/home:VIFIBnexedi/SlapOS-Node
# Development one
OBS_DIRECTORY=$CURRENT_DIRECTORY/home:VIFIBnexedi:branches:home:VIFIBnexedi/SlapOS-Node OBS_DIRECTORY=$CURRENT_DIRECTORY/home:VIFIBnexedi:branches:home:VIFIBnexedi/SlapOS-Node
......
[buildout] [buildout]
extends = extends =
http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-%RECIPE_VERSION%:/component/slapos/buildout.cfg %BUILDOUT_URL%
extends-cache= extends-cache extends-cache= extends-cache
download-cache= download-cache download-cache= download-cache
...@@ -16,21 +16,28 @@ download-cache= download-cache ...@@ -16,21 +16,28 @@ download-cache= download-cache
[python2.7] [python2.7]
configure-options += configure-options +=
--prefix=%TARGET_DIRECTORY%/parts/${:_buildout_section_name_} --prefix=%TARGET_DIRECTORY%/parts/${:_buildout_section_name_}
make-options += environment +=
DESTDIR=%BUILD_ROOT_DIRECTORY% DESTDIR=%BUILD_ROOT_DIRECTORY%
[openssl] [openssl]
configure-options += configure-options =
-I${zlib:location}/include
-L${zlib:location}/lib
--prefix=%TARGET_DIRECTORY%/parts/${:_buildout_section_name_} --prefix=%TARGET_DIRECTORY%/parts/${:_buildout_section_name_}
--openssldir=%TARGET_DIRECTORY%/parts/${:_buildout_section_name_}/etc/ssl --openssldir=%TARGET_DIRECTORY%/parts/${:_buildout_section_name_}/etc/ssl
--libdir=lib
shared no-idea no-mdc2 no-rc5 zlib
-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib
&& make depend
make-options += make-options +=
INSTALL_PREFIX=%BUILD_ROOT_DIRECTORY% INSTALL_PREFIX=%BUILD_ROOT_DIRECTORY%;
[gettext] [gettext]
configure-options += #configure-options +=
--prefix=%TARGET_DIRECTORY%/parts/${:_buildout_section_name_} # --prefix=%TARGET_DIRECTORY%/parts/${:_buildout_section_name_}
make-options += #make-options +=
DESTDIR=%BUILD_ROOT_DIRECTORY% # DESTDIR=%BUILD_ROOT_DIRECTORY%
# Add gettext library path to RPATH as its binaries are used to build # Add gettext library path to RPATH as its binaries are used to build
# glib for example # glib for example
environment = environment =
...@@ -43,4 +50,14 @@ configure-options += ...@@ -43,4 +50,14 @@ configure-options +=
make-options += make-options +=
DESTDIR=%BUILD_ROOT_DIRECTORY% DESTDIR=%BUILD_ROOT_DIRECTORY%
[slapos]
recipe = z3c.recipe.scripts
python = python2.7
eggs =
slapos.libnetworkcache
zc.buildout
${lxml-python:egg}
slapos.core
[version]
setuptools = 1.1.6
slapos-node (1.0+0.203+2) unstable; urgency=low
* New version of slapos (1.0+0.203+2)
-- Cedric de Saint Martin <cedric.dsm@nexedi.com> Wed, 08 Jan 2014 09:58:09 +0100
slapos-node (0.XXX+0.XXX+0) unstable; urgency=low slapos-node (0.XXX+0.XXX+0) unstable; urgency=low
* New version of SlapOS (0.XXX) * New version of SlapOS (0.XXX)
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
VERSION=%VERSION% VERSION=%VERSION%
RECIPE_VERSION=%RECIPE_VERSION% RECIPE_VERSION=%RECIPE_VERSION%
BUILDOUT_URL=%BUILDOUT_URL%
TARGET_DIRECTORY=/opt/slapos TARGET_DIRECTORY=/opt/slapos
BUILD_ROOT_DIRECTORY="$(pwd)/build" BUILD_ROOT_DIRECTORY="$(pwd)/build"
...@@ -22,7 +23,7 @@ set -e ...@@ -22,7 +23,7 @@ set -e
echo "$BUILD_ROOT_DIRECTORY" > ./original_directory echo "$BUILD_ROOT_DIRECTORY" > ./original_directory
sed "s/\%RECIPE_VERSION\%/$RECIPE_VERSION/g;s|\%PATCHES_DIRECTORY\%|$PATCHES_DIRECTORY|g;s|\%TARGET_DIRECTORY\%|$TARGET_DIRECTORY|g;s|\%BUILD_ROOT_DIRECTORY\%|$BUILD_ROOT_DIRECTORY|g;s|\%BUILD_DIRECTORY\%|$BUILD_DIRECTORY|g" buildout.cfg.in > $BUILD_DIRECTORY/buildout.cfg sed "s!\%BUILDOUT_URL\%!$BUILDOUT_URL!g;s/\%RECIPE_VERSION\%/$RECIPE_VERSION/g;s|\%PATCHES_DIRECTORY\%|$PATCHES_DIRECTORY|g;s|\%TARGET_DIRECTORY\%|$TARGET_DIRECTORY|g;s|\%BUILD_ROOT_DIRECTORY\%|$BUILD_ROOT_DIRECTORY|g;s|\%BUILD_DIRECTORY\%|$BUILD_DIRECTORY|g" buildout.cfg.in > $BUILD_DIRECTORY/buildout.cfg
# Build first time to get download-cache and extends-cache ready # Build first time to get download-cache and extends-cache ready
...@@ -58,7 +59,7 @@ find $BUILD_DIRECTORY -type d -empty -prune -exec rmdir '{}' ';' ...@@ -58,7 +59,7 @@ find $BUILD_DIRECTORY -type d -empty -prune -exec rmdir '{}' ';'
# Prepare buildout # Prepare buildout
sed "s/\%RECIPE_VERSION\%/$RECIPE_VERSION/g;s|\%PATCHES_DIRECTORY\%|$PATCHES_DIRECTORY|g;s|\%TARGET_DIRECTORY\%|$TARGET_DIRECTORY|g;s|\%BUILD_ROOT_DIRECTORY\%|$BUILD_ROOT_DIRECTORY|g;s|\%BUILD_DIRECTORY\%|$BUILD_DIRECTORY|g" $BUILD_ROOT_DIRECTORY/../buildout.cfg.in > $BUILD_DIRECTORY/buildout.cfg sed "s!\%BUILDOUT_URL\%!$BUILDOUT_URL!g;s/\%RECIPE_VERSION\%/$RECIPE_VERSION/g;s|\%PATCHES_DIRECTORY\%|$PATCHES_DIRECTORY|g;s|\%TARGET_DIRECTORY\%|$TARGET_DIRECTORY|g;s|\%BUILD_ROOT_DIRECTORY\%|$BUILD_ROOT_DIRECTORY|g;s|\%BUILD_DIRECTORY\%|$BUILD_DIRECTORY|g" $BUILD_ROOT_DIRECTORY/../buildout.cfg.in > $BUILD_DIRECTORY/buildout.cfg
...@@ -71,9 +72,3 @@ cd $BUILD_DIRECTORY && \ ...@@ -71,9 +72,3 @@ cd $BUILD_DIRECTORY && \
# package installation) and static libraries # package installation) and static libraries
find $BUILD_DIRECTORY -regextype posix-extended -type f \ find $BUILD_DIRECTORY -regextype posix-extended -type f \
-iregex '.*/*\.(py[co]|[l]?a|exe|bat)$$' -exec rm -fv '{}' ';' -iregex '.*/*\.(py[co]|[l]?a|exe|bat)$$' -exec rm -fv '{}' ';'
...@@ -40,15 +40,15 @@ Group: Application/Network ...@@ -40,15 +40,15 @@ Group: Application/Network
Source0: slapos-node_%{unmangled_version}+%{slapversion}+%{release_number}.tar.gz Source0: slapos-node_%{unmangled_version}+%{slapversion}+%{release_number}.tar.gz
URL: http://www.slapos.org/ URL: http://www.slapos.org/
Vendor: Vifib Vendor: Vifib
Packager: Arnaud Fontaine <arnaud.fontaine@nexedi.com>, Cédric Le Ninivin <cedric.leninivin@tiolive.com>, Cédric de Saint Martin <cedric.dsm@nexedi.com> Packager: Arnaud Fontaine <arnaud.fontaine@nexedi.com>, Cédric Le Ninivin <cedric.leninivin@tiolive.com>, Cédric de Saint Martin <cedric.dsm@nexedi.com>, Rafael Monnerat <rafael@nexedi.com>
%if 0%{?suse_version} == 1210 %if 0%{?suse_version} == 1210
BuildRequires: gcc-c++, make, patch, wget, python, python-devel, chrpath, python-distribute BuildRequires: gcc-c++, make, patch, wget, python, python-devel, chrpath, python-distribute, openssl-devel
Requires: bridge-utils, python, gcc-c++, make, patch, wget, python-distribute, openvpn Requires: bridge-utils, python, gcc-c++, make, patch, wget, python-distribute, openvpn
%else %else
BuildRequires: gcc-c++, make, patch, wget, python, python-devel, chrpath, python-setuptools BuildRequires: gcc-c++, make, patch, wget, python, python-devel, chrpath, python-setuptools, openssl-devel
Requires: bridge-utils, python, gcc-c++, make, patch, wget, python-setuptools, openvpn Requires: bridge-utils, python, gcc-c++, make, patch, wget, python-setuptools, openvpn
%endif %endif
......
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