From f2c400b81124b38241b7143920135d3907d13d60 Mon Sep 17 00:00:00 2001 From: Mark Date: Wed, 10 Feb 2016 13:32:26 +0000 Subject: [PATCH] Fix containerization on arm32 missing GLIBC_2.15 N.b. although the `docker build` invocation succeeds it is a false positive having timed out after build (see for status of that problem). Addresses --- setup/install-parachute.bash | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/setup/install-parachute.bash b/setup/install-parachute.bash index c751220..cfea865 100755 --- a/setup/install-parachute.bash +++ b/setup/install-parachute.bash @@ -1,4 +1,8 @@ #!/bin/bash +# +# TODO +# Work out what happens on non-ARM + set -x . "/opt/cloudfleet/apps/parachute/etc/cf-vars.sh" if [[ -z "${CF}" ]]; then @@ -46,6 +50,15 @@ fi mkdir -p $base +test_ccl() { + ${CF_APPS}/ccl/armcl --no-init --eval '(quit)' +} + +recompile_ccl () { + apt-get install -y make m4 binutils gcc + (cd ${CF_APPS}/ccl/lisp-kernel/linuxarm && make clean && make) +} + # Install CCL if [[ ! -z $ccl_uri ]]; then echo Installing CCL from _uri $ccl_uri @@ -54,7 +67,15 @@ if [[ ! -z $ccl_uri ]]; then if [ ! -d "${CF_APPS}/ccl" ]; then (cd "${CF_APPS}" && tar xvzf "$tmp/$file") fi - + test_ccl + if [[ $? -ne 0 ]]; then + recompile_ccl + test_ccl + if [[ $? -ne 0 ]]; then + echo "Failed to recompile CCL." + exit 1 + fi + fi fi # Download Quicklisp install shim @@ -77,4 +98,3 @@ $ccl --eval '(progn (require :asdf) (load (asdf:system-relative-pathname (asdf:f -