git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From 348163df412e53b1b7ec3e81ae5f22caa0227c37 Mon Sep 17 00:00:00 2001
   2 From: Ross Burton <ross.burton@intel.com>
   3 Date: Mon, 6 Jul 2015 15:19:41 +0100
   4 Subject: [PATCH] ca-certificates: remove Debianism in run-parts invocation
   5
   6 ca-certificates is a package from Debian, but some host distros such as Fedora
   7 have a leaner run-parts provided by cron which doesn't support --verbose or the
   8  -- separator between arguments and paths.
   9
  10 This solves errors such as
  11
  12 | Running hooks in [...]/rootfs/etc/ca-certificates/update.d...
  13 | [...]/usr/sbin/update-ca-certificates: line 194: Not: command not found
  14 | [...]/usr/sbin/update-ca-certificates: line 230: Not a directory: --: command not found
  15 | E: Not a directory: -- exited with code 127.
  16
  17 Upstream-Status: Inappropriate
  18 Signed-off-by: Ross Burton <ross.burton@intel.com>
  19 Signed-off-by: Maciej Borzecki <maciej.borzecki@rndity.com>
  20 ---
  21  sbin/update-ca-certificates | 4 +---
  22  1 file changed, 1 insertion(+), 3 deletions(-)
  23
  24 diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates
  25 index 36cdd9a..2d3e1fe 100755
  26 --- a/sbin/update-ca-certificates
  27 +++ b/sbin/update-ca-certificates
  28 @@ -202,9 +202,7 @@ if [ -d "$HOOKSDIR" ]
  29  then
  30
  31    echo "Running hooks in $HOOKSDIR..."
  32 -  VERBOSE_ARG=
  33 -  [ "$verbose" = 0 ] || VERBOSE_ARG="--verbose"
  34 -  eval run-parts "$VERBOSE_ARG" --test -- "$HOOKSDIR" | while read -r hook
  35 +  eval run-parts --test "$HOOKSDIR" | while read -r hook
  36    do
  37      ( cat "$ADDED"
  38        cat "$REMOVED" ) | "$hook" || echo "E: $hook exited with code $?."