diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2015-02-02 10:09:40 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-07 13:30:57 +0000 |
| commit | 33222af134c465791ed84eccd61bbc2b69ad81f1 (patch) | |
| tree | b3434a9bfe4aa17ab6bfd50e81e7ea78d30e0f59 /meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch | |
| parent | c603e720c865e0ff8391990ad6751bce74ab835f (diff) | |
| download | openembedded-core-contrib-33222af134c465791ed84eccd61bbc2b69ad81f1.tar.gz | |
ca-certificates: Upgrade to 20141019 (git based)
Rebase default-sysroot patch
Remove backported Mozilla certdata patch
License has not changed, just wording.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch')
| -rw-r--r-- | meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch b/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch index 7e0ee4cd24..6a5d6da676 100644 --- a/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch +++ b/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch @@ -4,13 +4,15 @@ update-ca-certificates: find SYSROOT relative to its own location This makes the script relocatable. ---- ca-certificates-20130119.orig/sbin/update-ca-certificates -+++ ca-certificates-20130119/sbin/update-ca-certificates -@@ -37,11 +37,44 @@ do +Index: git/sbin/update-ca-certificates +=================================================================== +--- git.orig/sbin/update-ca-certificates ++++ git/sbin/update-ca-certificates +@@ -37,6 +37,39 @@ do shift done - --CERTSCONF=$SYSROOT/etc/ca-certificates.conf + ++ +if [ -z "$SYSROOT" ]; then + local_which () { + if [ $# -lt 1 ]; then @@ -43,13 +45,6 @@ This makes the script relocatable. + SYSROOT= + fi +fi -+ + CERTSCONF=$SYSROOT/etc/ca-certificates.conf CERTSDIR=$SYSROOT/usr/share/ca-certificates -+CERTSCONF=$SYSROOT/etc/ca-certificates.conf -+ETCCERTSDIR=$SYSROOT/etc/ssl/certs LOCALCERTSDIR=$SYSROOT/usr/local/share/ca-certificates - CERTBUNDLE=ca-certificates.crt --ETCCERTSDIR=$SYSROOT/etc/ssl/certs - - cleanup() { - rm -f "$TEMPBUNDLE" |