summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2016-04-04 15:41:43 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-18 16:28:23 +0100
commit524d04cb0511d6dda4c6259e07a303f620555f78 (patch)
tree79b51bf7a1055de6e58369fa2fb3626ed58b715e /meta
parentecaf12ea5bf50ecef950f14a22e774e1d89aebb6 (diff)
downloadpoky-524d04cb0511d6dda4c6259e07a303f620555f78.tar.gz
ca-certificates: support Toybox
"mktemp -t" is deprecated and does not work when using Toybox. Replace with something that works also with Toybox. (From OE-Core rev: 8d47d075ca02612fe16e403be1aa2079edc3ef5f) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch34
-rw-r--r--meta/recipes-support/ca-certificates/ca-certificates_20160104.bb1
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch b/meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch
new file mode 100644
index 0000000000..6e2171f758
--- /dev/null
+++ b/meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch
@@ -0,0 +1,34 @@
1From 30378026d136efa779732e3f6664e2ecf461e458 Mon Sep 17 00:00:00 2001
2From: Patrick Ohly <patrick.ohly@intel.com>
3Date: Thu, 17 Mar 2016 12:38:09 +0100
4Subject: [PATCH] update-ca-certificates: support Toybox
5
6"mktemp -t" is deprecated and does not work when using Toybox. Replace
7with something that works also with Toybox.
8
9Upstream-Status: Pending
10
11Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
12---
13 sbin/update-ca-certificates | 6 +++---
14 1 file changed, 3 insertions(+), 3 deletions(-)
15
16diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates
17index 79c41bb..ae9e3f1 100755
18--- a/sbin/update-ca-certificates
19+++ b/sbin/update-ca-certificates
20@@ -113,9 +113,9 @@ trap cleanup 0
21
22 # Helper files. (Some of them are not simple arrays because we spawn
23 # subshells later on.)
24-TEMPBUNDLE="$(mktemp -t "${CERTBUNDLE}.tmp.XXXXXX")"
25-ADDED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
26-REMOVED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
27+TEMPBUNDLE="$(mktemp -p${TMPDIR:-/tmp} "${CERTBUNDLE}.tmp.XXXXXX")"
28+ADDED="$(mktemp -p${TMPDIR:-/tmp} "ca-certificates.tmp.XXXXXX")"
29+REMOVED="$(mktemp -p${TMPDIR:-/tmp} "ca-certificates.tmp.XXXXXX")"
30
31 # Adds a certificate to the list of trusted ones. This includes a symlink
32 # in /etc/ssl/certs to the certificate file and its inclusion into the
33--
342.1.4
diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20160104.bb b/meta/recipes-support/ca-certificates/ca-certificates_20160104.bb
index 4266926033..e0f1939137 100644
--- a/meta/recipes-support/ca-certificates/ca-certificates_20160104.bb
+++ b/meta/recipes-support/ca-certificates/ca-certificates_20160104.bb
@@ -17,6 +17,7 @@ SRC_URI = "git://anonscm.debian.org/collab-maint/ca-certificates.git \
17 file://0001-update-ca-certificates-remove-c-rehash.patch \ 17 file://0001-update-ca-certificates-remove-c-rehash.patch \
18 file://0002-update-ca-certificates-use-SYSROOT.patch \ 18 file://0002-update-ca-certificates-use-SYSROOT.patch \
19 file://0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch \ 19 file://0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch \
20 file://update-ca-certificates-support-Toybox.patch \
20 file://default-sysroot.patch \ 21 file://default-sysroot.patch \
21 file://sbindir.patch" 22 file://sbindir.patch"
22 23