- revert f3eabbb5c15fb55ae3d46b2377c09bb58226d965 - mktemp from busybox does not support '--tmpdir' option - coreutils is usually not possible to use because of 'GPLv3+' LICENSE
Signed-off-by: Andrej Valek <[email protected]> --- .../ca-certificates/ca-certificates/sbindir.patch | 10 ++-------- .../update-ca-certificates-support-Toybox.patch | 21 +++++++++++---------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch b/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch index f343ebf16e..a113fa8b15 100644 --- a/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch +++ b/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch @@ -1,12 +1,6 @@ -sbin/Makefile: Allow the sbin path to be configurable +Upstream-Status: Pending -Some project sharing ca-certificates from Debian allow configuration -of the installation location. Make the sbin location configurable. - -Also ensure the target directory exists - -Signed-off-by: Richard Purdie <[email protected]> -Upstream-Status: Submitted [https://salsa.debian.org/debian/ca-certificates/-/merge_requests/5] +Let us alter the install destination of the script via SBINDIR --- ca-certificates-20130119.orig/sbin/Makefile +++ ca-certificates-20130119/sbin/Makefile 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 index f78790923c..6e2171f758 100644 --- 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 @@ -1,13 +1,14 @@ -update-ca-certificates: Replace deprecated mktemp -t with mktemp --tmpdir +From 30378026d136efa779732e3f6664e2ecf461e458 Mon Sep 17 00:00:00 2001 +From: Patrick Ohly <[email protected]> +Date: Thu, 17 Mar 2016 12:38:09 +0100 +Subject: [PATCH] update-ca-certificates: support Toybox -According to coreutils docs, mktemp -t is deprecated, switch to the ---tmpdir option instead. +"mktemp -t" is deprecated and does not work when using Toybox. Replace +with something that works also with Toybox. -Signed-off-by: Richard Purdie <[email protected]> -Upstream-Status: Submitted [https://salsa.debian.org/debian/ca-certificates/-/merge_requests/5] +Upstream-Status: Pending -[This was originally for compatibility with toybox but toybox now -supports -t] +Signed-off-by: Patrick Ohly <[email protected]> --- sbin/update-ca-certificates | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) @@ -23,9 +24,9 @@ index 79c41bb..ae9e3f1 100755 -TEMPBUNDLE="$(mktemp -t "${CERTBUNDLE}.tmp.XXXXXX")" -ADDED="$(mktemp -t "ca-certificates.tmp.XXXXXX")" -REMOVED="$(mktemp -t "ca-certificates.tmp.XXXXXX")" -+TEMPBUNDLE="$(mktemp --tmpdir "${CERTBUNDLE}.tmp.XXXXXX")" -+ADDED="$(mktemp --tmpdir "ca-certificates.tmp.XXXXXX")" -+REMOVED="$(mktemp --tmpdir "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.11.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#153196): https://lists.openembedded.org/g/openembedded-core/message/153196 Mute This Topic: https://lists.openembedded.org/mt/83711852/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
