]> code.ossystems Code Review - openembedded-core.git/commitdiff
ca-certificates: run postinst script only for -target package
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>
Thu, 15 Mar 2018 11:27:06 +0000 (13:27 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 26 Mar 2018 14:06:25 +0000 (15:06 +0100)
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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
meta/recipes-support/ca-certificates/ca-certificates_20170717.bb

index 7d59fa63742e8af94717e801b696e35cf3693a87..e4ffbd34d569c58a6a342070358fbc8dcc9054db 100644 (file)
@@ -64,13 +64,14 @@ do_install_append_class-target () {
         ${D}${mandir}/man8/update-ca-certificates.8
 }
 
-pkg_postinst_${PN} () {
+pkg_postinst_${PN}_class-target () {
     SYSROOT="$D" $D${sbindir}/update-ca-certificates
 }
 
 CONFFILES_${PN} += "${sysconfdir}/ca-certificates.conf"
 
-# Postinsts don't seem to be run for nativesdk packages when populating SDKs.
+# Rather than make a postinst script that works for both target and nativesdk,
+# we just run update-ca-certificate from do_install() for nativesdk.
 CONFFILES_${PN}_append_class-nativesdk = " ${sysconfdir}/ssl/certs/ca-certificates.crt"
 do_install_append_class-nativesdk () {
     SYSROOT="${D}${SDKPATHNATIVE}" ${D}${sbindir}/update-ca-certificates