diff options
| author | Maciej Borzecki <maciej.borzecki@rndity.com> | 2016-08-08 10:11:24 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-10 10:46:32 +0100 |
| commit | 0e421c93a85ee307d4a1a2508f7c1fc533bb6a8b (patch) | |
| tree | 6660120cb24661c6e1a877a5a1589b5686bb0577 /meta/recipes-support/ca-certificates | |
| parent | 309a6e01e3b40022c23df1f72ad5a6e9df65b334 (diff) | |
| download | poky-0e421c93a85ee307d4a1a2508f7c1fc533bb6a8b.tar.gz | |
ca-certificates: remove -- separator
Options and directory separator -- slipped past the patch removing
Debianims, thus resulting in failures on hosts running Fedora.
(From OE-Core rev: a8431689983f5860173548acd899e6806906e4d1)
Signed-off-by: Maciej Borzecki <maciej.borzecki@rndity.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/ca-certificates')
| -rw-r--r-- | meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch | 6 |
1 files changed, 5 insertions, 1 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 index 4b4b287d4e..4a8ae5f4b5 100644 --- 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 | |||
| @@ -6,9 +6,13 @@ This solves errors such as | |||
| 6 | 6 | ||
| 7 | | Running hooks in [...]/rootfs/etc/ca-certificates/update.d... | 7 | | Running hooks in [...]/rootfs/etc/ca-certificates/update.d... |
| 8 | | [...]/usr/sbin/update-ca-certificates: line 194: Not: command not found | 8 | | [...]/usr/sbin/update-ca-certificates: line 194: Not: command not found |
| 9 | | [...]/usr/sbin/update-ca-certificates: line 230: Not a directory: --: command not found | ||
| 10 | | E: Not a directory: -- exited with code 127. | ||
| 11 | |||
| 9 | 12 | ||
| 10 | Upstream-Status: Inappropriate | 13 | Upstream-Status: Inappropriate |
| 11 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 14 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 15 | Signed-off-by: Maciej Borzecki <maciej.borzecki@rndity.com> | ||
| 12 | --- | 16 | --- |
| 13 | sbin/update-ca-certificates | 4 +--- | 17 | sbin/update-ca-certificates | 4 +--- |
| 14 | 1 file changed, 1 insertion(+), 3 deletions(-) | 18 | 1 file changed, 1 insertion(+), 3 deletions(-) |
| @@ -24,7 +28,7 @@ Index: git/sbin/update-ca-certificates | |||
| 24 | - VERBOSE_ARG= | 28 | - VERBOSE_ARG= |
| 25 | - [ "$verbose" = 0 ] || VERBOSE_ARG="--verbose" | 29 | - [ "$verbose" = 0 ] || VERBOSE_ARG="--verbose" |
| 26 | - eval run-parts "$VERBOSE_ARG" --test -- "$HOOKSDIR" | while read hook | 30 | - eval run-parts "$VERBOSE_ARG" --test -- "$HOOKSDIR" | while read hook |
| 27 | + eval run-parts --test -- "$HOOKSDIR" | while read hook | 31 | + eval run-parts --test "$HOOKSDIR" | while read hook |
| 28 | do | 32 | do |
| 29 | ( cat "$ADDED" | 33 | ( cat "$ADDED" |
| 30 | cat "$REMOVED" ) | "$hook" || echo "E: $hook exited with code $?." | 34 | cat "$REMOVED" ) | "$hook" || echo "E: $hook exited with code $?." |