summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2015-11-13 14:36:50 +0900
committerBaserock Gerrit <gerrit@baserock.org>2015-11-14 22:25:02 +0000
commit6c308ed0002b54771e4d90a5a27e284a4b6043f3 (patch)
tree5e87844cd21c146fc1991deae5a34451c206f24e
parenta0e15a4466eed09654523939ff3b375d73c889ee (diff)
downloaddefinitions-6c308ed0002b54771e4d90a5a27e284a4b6043f3.tar.gz
Provide certificate path to libcurl in core stratum
Without this, compilation of libcurl succeeds but does not have a default path to search for CA certs at runtime, and most libcurl depending software does not provide it's own certificates or set the default path. Also removed build dependency on ca-certificates. Change-Id: I5f3d33858e3fe65d57d93a38397239c1a421e69a
-rw-r--r--strata/core.morph1
-rw-r--r--strata/core/curl.morph8
2 files changed, 7 insertions, 2 deletions
diff --git a/strata/core.morph b/strata/core.morph
index a9ea2e4b..dc6e6ecf 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -151,7 +151,6 @@ chunks:
- file
- libtool-tarball
- openssl-new
- - ca-certificates
- name: gettext-tarball
morph: strata/core/gettext-tarball.morph
repo: upstream:gettext-tarball
diff --git a/strata/core/curl.morph b/strata/core/curl.morph
index e245688c..d445ee00 100644
--- a/strata/core/curl.morph
+++ b/strata/core/curl.morph
@@ -1,8 +1,14 @@
name: curl
kind: chunk
configure-commands:
+#
+# Curl must be configured --with-ca-bundle in order to find the
+# correct certificate bundle at runtime, which is later generated
+# by update-ca-certificates. Other applications such as git, rely
+# on curl knowing the default location of the certs.
+#
- ./buildconf
-- ./configure --disable-manual --prefix="$PREFIX"
+- ./configure --disable-manual --prefix="$PREFIX" --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
build-commands:
- make
install-commands: