diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-03-15 13:27:06 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-26 15:07:11 +0100 |
commit | d3c573ee1adda7e5535ef77b8c3e17c94db5ed24 (patch) | |
tree | b7a41996c6ac83e3608c4aa76b8960703ee97bc5 /meta/recipes-support | |
parent | 89d4430fa30bfb9ea19e440b56e936a2237f89f8 (diff) | |
download | poky-d3c573ee1adda7e5535ef77b8c3e17c94db5ed24.tar.gz |
ca-certificates: run postinst script only for -target package
Nativesdk package has a special arrangement where the same thing is done
in do_install(). It was assumed (in the comment) that postinsts don't run when
installing nativesdk packages, but this was incorrect: they are run, but
any failures were previously silently ignored. Now this missing failure reporting has
been fixed, and so we get to see the failures.
(From OE-Core rev: 8ebb695c1429f8d57d655072a362a4f176258699)
(From OE-Core rev: 31f69f8fd8a08fadee0ea288214aa33c33ad6912)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/ca-certificates/ca-certificates_20170717.bb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20170717.bb b/meta/recipes-support/ca-certificates/ca-certificates_20170717.bb index 7d59fa6374..e4ffbd34d5 100644 --- a/meta/recipes-support/ca-certificates/ca-certificates_20170717.bb +++ b/meta/recipes-support/ca-certificates/ca-certificates_20170717.bb | |||
@@ -64,13 +64,14 @@ do_install_append_class-target () { | |||
64 | ${D}${mandir}/man8/update-ca-certificates.8 | 64 | ${D}${mandir}/man8/update-ca-certificates.8 |
65 | } | 65 | } |
66 | 66 | ||
67 | pkg_postinst_${PN} () { | 67 | pkg_postinst_${PN}_class-target () { |
68 | SYSROOT="$D" $D${sbindir}/update-ca-certificates | 68 | SYSROOT="$D" $D${sbindir}/update-ca-certificates |
69 | } | 69 | } |
70 | 70 | ||
71 | CONFFILES_${PN} += "${sysconfdir}/ca-certificates.conf" | 71 | CONFFILES_${PN} += "${sysconfdir}/ca-certificates.conf" |
72 | 72 | ||
73 | # Postinsts don't seem to be run for nativesdk packages when populating SDKs. | 73 | # Rather than make a postinst script that works for both target and nativesdk, |
74 | # we just run update-ca-certificate from do_install() for nativesdk. | ||
74 | CONFFILES_${PN}_append_class-nativesdk = " ${sysconfdir}/ssl/certs/ca-certificates.crt" | 75 | CONFFILES_${PN}_append_class-nativesdk = " ${sysconfdir}/ssl/certs/ca-certificates.crt" |
75 | do_install_append_class-nativesdk () { | 76 | do_install_append_class-nativesdk () { |
76 | SYSROOT="${D}${SDKPATHNATIVE}" ${D}${sbindir}/update-ca-certificates | 77 | SYSROOT="${D}${SDKPATHNATIVE}" ${D}${sbindir}/update-ca-certificates |