summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-03-15 13:27:06 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-20 09:59:31 +0000
commitf2103873bd100f8dae868c15371993a3316bf564 (patch)
tree8a4e7a69b893fe604ee57b802ed944a3b3495bc9
parentde3e16b675bde2d6f919b08a0a7fd358dc0deab3 (diff)
downloadpoky-f2103873bd100f8dae868c15371993a3316bf564.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) 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>
-rw-r--r--meta/recipes-support/ca-certificates/ca-certificates_20170717.bb5
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 52a1a07f68..51af72e79a 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
67pkg_postinst_${PN} () { 67pkg_postinst_${PN}_class-target () {
68 SYSROOT="$D" $D${sbindir}/update-ca-certificates 68 SYSROOT="$D" $D${sbindir}/update-ca-certificates
69} 69}
70 70
71CONFFILES_${PN} += "${sysconfdir}/ca-certificates.conf" 71CONFFILES_${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.
74CONFFILES_${PN}_append_class-nativesdk = " ${sysconfdir}/ssl/certs/ca-certificates.crt" 75CONFFILES_${PN}_append_class-nativesdk = " ${sysconfdir}/ssl/certs/ca-certificates.crt"
75do_install_append_class-nativesdk () { 76do_install_append_class-nativesdk () {
76 SYSROOT="${D}${SDKPATHNATIVE}" ${D}${sbindir}/update-ca-certificates 77 SYSROOT="${D}${SDKPATHNATIVE}" ${D}${sbindir}/update-ca-certificates