Commit bf5daff2 authored by Rafael Monnerat's avatar Rafael Monnerat

obs/slapos: Update to build with zc.buildout 2.5.2-nexedi

parent 5ceef817
Pipeline #1614 skipped
slapos-node (1.3.9+0.250.1+1) unstable; urgency=low slapos-node (1.3.15+1.0.35+1) unstable; urgency=low
* New version of slapos (1.3.9+0.250.1+1) * New version of slapos with buildout2 (1.3.15+1.0.15.1+1)
-- Rafael Monnerat <rafael@nexedi.com> Sun, 22 Mar 2015 13:48:16 +0100 -- Rafael Monnerat <rafael@nexedi.com> Sun, 22 Mar 2015 13:48:16 +0100
......
...@@ -9,8 +9,10 @@ source release_configuration.sh ...@@ -9,8 +9,10 @@ source release_configuration.sh
TARGET_DIRECTORY=/opt/slapos TARGET_DIRECTORY=/opt/slapos
BUILD_ROOT_DIRECTORY="$CURRENT_DIRECTORY/$SLAPOS_DIRECTORY/slapos/build" BUILD_ROOT_DIRECTORY="$CURRENT_DIRECTORY/$SLAPOS_DIRECTORY/slapos/build"
BUILD_DIRECTORY=$BUILD_ROOT_DIRECTORY$TARGET_DIRECTORY BUILD_DIRECTORY=$BUILD_ROOT_DIRECTORY$TARGET_DIRECTORY
BUILDOUT_VERSION=2.5.2+slapos002
SETUPTOOL_VERSION=19.6.2
#rm -rf $BUILD_ROOT_DIRECTORY rm -rf $BUILD_ROOT_DIRECTORY
#./configure --prefix=/opt/slapos/parts/<NAME> #./configure --prefix=/opt/slapos/parts/<NAME>
...@@ -33,8 +35,8 @@ echo "$BUILD_ROOT_DIRECTORY" > ./original_directory ...@@ -33,8 +35,8 @@ echo "$BUILD_ROOT_DIRECTORY" > ./original_directory
wget https://bootstrap.pypa.io/bootstrap-buildout.py --no-check-certificate -O bootstrap.py wget https://bootstrap.pypa.io/bootstrap-buildout.py --no-check-certificate -O bootstrap.py
(python -S bootstrap.py --buildout-version 2.5.1.post2 \ (python -S bootstrap.py --buildout-version $BUILDOUT_VERSION \
--setuptools-version 19.6.2 \ --setuptools-version $SETUPTOOL_VERSION \
--setuptools-to-dir eggs \ --setuptools-to-dir eggs \
-f http://www.nexedi.org/static/packages/source/ \ -f http://www.nexedi.org/static/packages/source/ \
-f http://www.nexedi.org/static/packages/source/slapos.buildout/ && \ -f http://www.nexedi.org/static/packages/source/slapos.buildout/ && \
...@@ -52,12 +54,12 @@ cp -R eggs/slapos.rebootstrap* $BUILD_ROOT_DIRECTORY/.. ...@@ -52,12 +54,12 @@ cp -R eggs/slapos.rebootstrap* $BUILD_ROOT_DIRECTORY/..
rm -fv .installed.cfg environment.* rm -fv .installed.cfg environment.*
rm -rfv ./{downloads,parts,eggs,develop-eggs,bin,rebootstrap} rm -rfv ./{downloads,parts,eggs,develop-eggs,bin,rebootstrap}
# Removing empty directories Removing empty directories
find . -type d -empty -prune -exec rmdir '{}' ';' find . -type d -empty -prune -exec rmdir '{}' ';'
mkdir -p $BUILD_DIRECTORY/eggs mkdir -p $BUILD_DIRECTORY/eggs
python -S bootstrap.py --setuptools-version 19.6.2 \ python -S bootstrap.py --setuptools-version $SETUPTOOL_VERSION \
--buildout-version 2.5.1.post2 \ --buildout-version $BUILDOUT_VERSION \
--setuptools-to-dir eggs \ --setuptools-to-dir eggs \
-f http://www.nexedi.org/static/packages/source/ \ -f http://www.nexedi.org/static/packages/source/ \
-f http://www.nexedi.org/static/packages/source/slapos.buildout/ -f http://www.nexedi.org/static/packages/source/slapos.buildout/
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
# Edit for release # Edit for release
VERSION=1.3.15 VERSION=1.3.15
# Edit for release # Edit for release
RECIPE_VERSION=1.0.32 RECIPE_VERSION=1.0.35
# Edit for release # Edit for release
RELEASE=7 RELEASE=1
CURRENT_DIRECTORY="$(pwd)" CURRENT_DIRECTORY="$(pwd)"
# Development Section # Development Section
......
...@@ -124,6 +124,3 @@ configure-options = ...@@ -124,6 +124,3 @@ configure-options =
[versions] [versions]
cliff = 1.4.5 cliff = 1.4.5
slapos.core = 1.3.15
zc.buildout = 2.5.1.post2
zc.recipe.egg = 2.0.3.post1
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