From a07dffadfb3105afae803b343993112f5fd43894 Mon Sep 17 00:00:00 2001 From: Romain Courteaud <romain@nexedi.com> Date: Fri, 9 Aug 2013 16:48:57 +0200 Subject: [PATCH] Check component's binary creation. --- component/coreutils/buildout.cfg | 6 +++++- component/nginx/buildout.cfg | 12 ++++++++++++ component/openssl/buildout.cfg | 11 ++++++++++- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/component/coreutils/buildout.cfg b/component/coreutils/buildout.cfg index 7c9ba2da0..7e8281b41 100644 --- a/component/coreutils/buildout.cfg +++ b/component/coreutils/buildout.cfg @@ -19,7 +19,11 @@ environment = recipe = plone.recipe.command stop-on-error = true update-command = ${:command} -command = ${:test} -x ${:test} -a -x ${:cat} -a -x ${:rm} +command = ${:test} -x ${:test} -a -x ${:cat} -a -x ${:rm} -a -x ${:echo} -a -x ${:date} -a -x ${:md5sum} -a -x ${:basename} test = ${coreutils:location}/bin/test cat = ${coreutils:location}/bin/cat rm = ${coreutils:location}/bin/rm +echo = ${coreutils:location}/bin/echo +date = ${coreutils:location}/bin/date +md5sum = ${coreutils:location}/bin/md5sum +basename = ${coreutils:location}/bin/basename diff --git a/component/nginx/buildout.cfg b/component/nginx/buildout.cfg index 2774d90e0..6903e4d7e 100644 --- a/component/nginx/buildout.cfg +++ b/component/nginx/buildout.cfg @@ -3,6 +3,9 @@ extends = ../pcre/buildout.cfg ../zlib/buildout.cfg ../openssl/buildout.cfg + ../coreutils/buildout.cfg + +parts = nginx-output [nginx] recipe = slapos.recipe.cmmi @@ -16,6 +19,15 @@ configure-options= --with-ld-opt="-L ${zlib:location}/lib -L ${openssl:location}/lib -L ${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib" --with-cc-opt="-I ${pcre:location}/include -I ${openssl:location}/include -I ${zlib:location}/include" +[nginx-output] +# Shared binary location to ease migration +recipe = plone.recipe.command +stop-on-error = true +update-command = ${:command} +command = ${coreutils-output:test} -x ${:nginx} -a -f ${:mime} +nginx = ${nginx:location}/sbin/nginx +mime = ${nginx:location}/conf/mime.types + [nginx-unstable] <= nginx url = http://nginx.org/download/nginx-1.3.15.tar.gz diff --git a/component/openssl/buildout.cfg b/component/openssl/buildout.cfg index b3671b630..c19e834d5 100644 --- a/component/openssl/buildout.cfg +++ b/component/openssl/buildout.cfg @@ -8,9 +8,10 @@ extends = ../ca-certificates/buildout.cfg ../zlib/buildout.cfg ../patch/buildout.cfg + ../coreutils/buildout.cfg parts = - openssl + openssl-output [openssl-nodoc.patch] # Disable doc generation part in Makefile @@ -52,3 +53,11 @@ make-options = -j1 make-targets = all install_sw && rm -f ${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl/certs/* && for i in ${ca-certificates:location}/certs/*/*.crt; do ln -sv $i ${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl/certs/`${buildout:parts-directory}/${:_buildout_section_name_}/bin/openssl x509 -hash -noout -in $i`.0; done; true + +[openssl-output] +# Shared binary location to ease migration +recipe = plone.recipe.command +stop-on-error = true +update-command = ${:command} +command = ${coreutils-output:test} -x ${:openssl} +openssl = ${openssl:location}/bin/openssl -- 2.30.9