mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-30 12:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

ca-certificates: support Toybox

Browse Source 
"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>
This commit is contained in:
Patrick Ohly
2016-04-04 15:41:43 +02:00
committed by Richard Purdie
parent ecaf12ea5b
commit 524d04cb05
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch Normal file
View File

@@ -0,0 +1,34 @@
From 30378026d136efa779732e3f6664e2ecf461e458 Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Thu, 17 Mar 2016 12:38:09 +0100
Subject: [PATCH] update-ca-certificates: support Toybox
"mktemp -t" is deprecated and does not work when using Toybox. Replace
with something that works also with Toybox.
Upstream-Status: Pending
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
---
sbin/update-ca-certificates | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates
index 79c41bb..ae9e3f1 100755
--- a/sbin/update-ca-certificates
+++ b/sbin/update-ca-certificates
@@ -113,9 +113,9 @@ trap cleanup 0
# Helper files. (Some of them are not simple arrays because we spawn
# subshells later on.)
-TEMPBUNDLE="$(mktemp -t "${CERTBUNDLE}.tmp.XXXXXX")"
-ADDED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
-REMOVED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
+TEMPBUNDLE="$(mktemp -p${TMPDIR:-/tmp} "${CERTBUNDLE}.tmp.XXXXXX")"
+ADDED="$(mktemp -p${TMPDIR:-/tmp} "ca-certificates.tmp.XXXXXX")"
+REMOVED="$(mktemp -p${TMPDIR:-/tmp} "ca-certificates.tmp.XXXXXX")"
# Adds a certificate to the list of trusted ones. This includes a symlink
# in /etc/ssl/certs to the certificate file and its inclusion into the
--
2.1.4

1
meta/recipes-support/ca-certificates/ca-certificates_20160104.bb
View File

@@ -17,6 +17,7 @@ SRC_URI = "git://anonscm.debian.org/collab-maint/ca-certificates.git \
file://0001-update-ca-certificates-remove-c-rehash.patch \
file://0002-update-ca-certificates-use-SYSROOT.patch \
file://0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch \
file://update-ca-certificates-support-Toybox.patch \
file://default-sysroot.patch \
file://sbindir.patch"