From 4f0d3ec7aa4ebc91793245ed66c0e24d7150782b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 20 Feb 2021 15:24:03 +0000 Subject: sbin/Makefile: Allow the sbin path to be configurable 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 --- sbin/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sbin/Makefile b/sbin/Makefile index a9658e7..1976cc3 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -3,9 +3,12 @@ # # +SBINDIR = /usr/sbin + all: clean: install: - install -m755 update-ca-certificates $(DESTDIR)/usr/sbin/ + install -d $(DESTDIR)$(SBINDIR) + install -m755 update-ca-certificates $(DESTDIR)$(SBINDIR)/ -- cgit v1.2.1 From 66951d3b45ffe24d182d36ec02d3ec7aee30ece7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 20 Feb 2021 15:31:29 +0000 Subject: update-ca-certificates: Replace deprecated mktemp -t with mktemp --tmpdir According to coreutils docs, mktemp -t is deprecated, switch to the --tmpdir option instead. Signed-off-by: Richard Purdie --- sbin/update-ca-certificates | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates index 95fb1d9..789867f 100755 --- a/sbin/update-ca-certificates +++ b/sbin/update-ca-certificates @@ -81,8 +81,8 @@ trap cleanup 0 # Helper files. (Some of them are not simple arrays because we spawn # subshells later on.) TEMPBUNDLE="${ETCCERTSDIR}/${CERTBUNDLE}.new" -ADDED="$(mktemp -t "ca-certificates.tmp.XXXXXX")" -REMOVED="$(mktemp -t "ca-certificates.tmp.XXXXXX")" +ADDED="$(mktemp --tmpdir "ca-certificates.tmp.XXXXXX")" +REMOVED="$(mktemp --tmpdir "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 -- cgit v1.2.1