aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2018-05-22 11:50:01 +0200
committerLoïc Hoguin <[email protected]>2018-05-22 11:50:01 +0200
commit41eff6b8ea139cb02f1a0b57d67bc08e411f5848 (patch)
tree0dc989f089739b1ef58ef66f580f58ed79ab51f8
parentefe325665a5162144bbbbcd75c7c25451c3cbac4 (diff)
downloadci-41eff6b8ea139cb02f1a0b57d67bc08e411f5848.tar.gz
ci-41eff6b8ea139cb02f1a0b57d67bc08e411f5848.tar.bz2
ci-41eff6b8ea139cb02f1a0b57d67bc08e411f5848.zip
Put the OpenSSL 1.0 fix in /usr/openssl-1.0
-rw-r--r--ci.d/openssl8
-rw-r--r--priv/buildkite-environment-hook-openssl-fix-102
2 files changed, 5 insertions, 5 deletions
diff --git a/ci.d/openssl b/ci.d/openssl
index 2d61491..9648ebd 100644
--- a/ci.d/openssl
+++ b/ci.d/openssl
@@ -4,10 +4,10 @@
#
# Setup OpenSSL 1.0 for older Erlang versions.
openssl_fix_10() {
- lxc_do mkdir /home/buildkite-agent/openssl-1.0
- lxc_do ln -s /usr/include/openssl-1.0 /home/buildkite-agent/openssl-1.0/include
- lxc_do ln -s /usr/lib/openssl-1.0 /home/buildkite-agent/openssl-1.0/lib
- echo "lxc.environment = KERL_CONFIGURE_OPTIONS=--with-ssl=/home/buildkite-agent/openssl-1.0" \
+ lxc_do mkdir /usr/openssl-1.0
+ lxc_do ln -s /usr/include/openssl-1.0 /usr/openssl-1.0/include
+ lxc_do ln -s /usr/lib/openssl-1.0 /usr/openssl-1.0/lib
+ echo "lxc.environment = KERL_CONFIGURE_OPTIONS=--with-ssl=/usr/openssl-1.0" \
>> /home/lxc/$NAME/config
}
diff --git a/priv/buildkite-environment-hook-openssl-fix-10 b/priv/buildkite-environment-hook-openssl-fix-10
index 1a68e24..4805283 100644
--- a/priv/buildkite-environment-hook-openssl-fix-10
+++ b/priv/buildkite-environment-hook-openssl-fix-10
@@ -2,4 +2,4 @@
set -e
-export KERL_CONFIGURE_OPTIONS=--with-ssl=/home/buildkite-agent/openssl-1.0
+export KERL_CONFIGURE_OPTIONS=--with-ssl=/usr/openssl-1.0