diff options
author | Ross Burton <ross.burton@intel.com> | 2015-07-06 15:19:41 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-08 00:01:23 +0100 |
commit | 21bdccb23e5dec65db7f5c09aee6772f4b79a6cd (patch) | |
tree | c21cc5c188f26d694aecd05a28a450878e050542 /meta | |
parent | 9238984340ec80f51183bc1859ccd6c0467a7c6c (diff) | |
download | poky-21bdccb23e5dec65db7f5c09aee6772f4b79a6cd.tar.gz |
ca-certificates: remove Debianism in run-parts invocation
ca-certificates comes from Debian but not all distros (i.e. Fedora) have a
leaner run-parts that doesn't support the -- separator between options and
paths, which causes this error:
| Running hooks in [...]/rootfs/etc/ca-certificates/update.d...
| [...]/usr/sbin/update-ca-certificates: line 194: Not: command not found
(From OE-Core rev: db2116e7a06c6a35d1d24d9f28ec60926d59b9d7)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch b/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch new file mode 100644 index 0000000000..d7d487e676 --- /dev/null +++ b/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | ca-certificates is a package from Debian, but some host distros such as Fedora | ||
2 | have a leaner run-parts provided by cron which doesn't support --verbose or the | ||
3 | -- separator between arguments and paths. | ||
4 | |||
5 | This solves errors such as | ||
6 | |||
7 | | Running hooks in [...]/rootfs/etc/ca-certificates/update.d... | ||
8 | | [...]/usr/sbin/update-ca-certificates: line 194: Not: command not found | ||
9 | |||
10 | Upstream-Status: Inappropriate | ||
11 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
12 | --- | ||
13 | sbin/update-ca-certificates | 4 +--- | ||
14 | 1 file changed, 1 insertion(+), 3 deletions(-) | ||
15 | |||
16 | diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates | ||
17 | index fed9c25..29ecc69 100755 | ||
18 | --- a/sbin/update-ca-certificates | ||
19 | +++ b/sbin/update-ca-certificates | ||
20 | @@ -186,9 +186,7 @@ echo "$ADDED_CNT added, $REMOVED_CNT removed; done." | ||
21 | |||
22 | HOOKSDIR=$SYSROOT/etc/ca-certificates/update.d | ||
23 | echo -n "Running hooks in $HOOKSDIR...." | ||
24 | -VERBOSE_ARG= | ||
25 | -[ "$verbose" = 0 ] || VERBOSE_ARG=--verbose | ||
26 | -eval run-parts $VERBOSE_ARG --test -- $HOOKSDIR | while read hook | ||
27 | +eval run-parts --test $HOOKSDIR | while read hook | ||
28 | do | ||
29 | ( cat $ADDED | ||
30 | cat $REMOVED ) | $hook || echo E: $hook exited with code $?. | ||
31 | -- | ||
32 | 2.1.4 | ||
33 | |||
diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20141019.bb b/meta/recipes-support/ca-certificates/ca-certificates_20141019.bb index 421b87ec02..cc58e4d60b 100644 --- a/meta/recipes-support/ca-certificates/ca-certificates_20141019.bb +++ b/meta/recipes-support/ca-certificates/ca-certificates_20141019.bb | |||
@@ -17,6 +17,7 @@ SRCREV = "2b8a047c78aadbecd90bf8e49ccf68898a211610" | |||
17 | SRC_URI = "git://anonscm.debian.org/collab-maint/ca-certificates.git \ | 17 | SRC_URI = "git://anonscm.debian.org/collab-maint/ca-certificates.git \ |
18 | file://0001-update-ca-certificates-remove-c-rehash.patch \ | 18 | file://0001-update-ca-certificates-remove-c-rehash.patch \ |
19 | file://0002-update-ca-certificates-use-SYSROOT.patch \ | 19 | file://0002-update-ca-certificates-use-SYSROOT.patch \ |
20 | file://0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch \ | ||
20 | file://default-sysroot.patch \ | 21 | file://default-sysroot.patch \ |
21 | file://sbindir.patch" | 22 | file://sbindir.patch" |
22 | 23 | ||