diff options
| author | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2015-11-13 14:40:55 +0900 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2015-11-14 22:27:09 +0000 |
| commit | 4b9f6341f0d0a890c6a112a1db077506a86f4fb8 (patch) | |
| tree | d8c99197778b3712d8af2afc4c02d2ea2dc2e28c /strata/core | |
| parent | 08a8c658812b9218489c2c223171230cbd3fdd8b (diff) | |
| download | definitions-4b9f6341f0d0a890c6a112a1db077506a86f4fb8.tar.gz | |
Updated ca-certificates chunk
This patch uses the new upstream delta based on the 2015 default
certificates used by debian, and drops the delta which was used
to force an update-ca-certificates invokation at make install time.
Now we no longer run the update-ca-certificates at make install time
and only run it at system-integration time.
Change-Id: I0de520d64f45c64aa3d213b9099211b5ab8a50dd
Diffstat (limited to 'strata/core')
| -rw-r--r-- | strata/core/ca-certificates.morph | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/strata/core/ca-certificates.morph b/strata/core/ca-certificates.morph index 195d45d4..0497b283 100644 --- a/strata/core/ca-certificates.morph +++ b/strata/core/ca-certificates.morph @@ -4,26 +4,22 @@ build-system: manual build-commands: - make install-commands: +# +# ca-certificates makefile does not properly take responsibility +# for creating the paths it installs to +# - mkdir -p "$DESTDIR"/usr/share/ca-certificates - mkdir -p "$DESTDIR"/usr/sbin - make DESTDIR="$DESTDIR" install - mkdir "$DESTDIR"/etc -- | - cd "$DESTDIR"/usr/share/ca-certificates - find * -type f > "$DESTDIR"/etc/ca-certificates.conf -# -# The curl build requires some certificates to be present -# at build time. Building curl without the certificates -# installed results in a git which cannot use https. # -# See: http://listmaster.pepperfish.net/pipermail/baserock-dev-baserock.org/2015-January/010419.html +# We create the config with all certificates provided +# by the debian package enabled. Some systems may want +# to override the ca-certificates.conf file. # - | - export CERTSCONF="$DESTDIR/etc/ca-certificates.conf" - export CERTSDIR="$DESTDIR/usr/share/ca-certificates" - export ETCCERTSDIR="$DESTDIR/etc/ssl/certs" - mkdir -p "$ETCCERTSDIR" - ./sbin/update-ca-certificates + cd "$DESTDIR"/usr/share/ca-certificates + find * -type f > "$DESTDIR"/etc/ca-certificates.conf system-integration: ca-certificates-misc: 00-update-ca-certs: |