summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-24 15:09:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-25 12:08:50 +0100
commite2328da34446317313d6a121c778a39a5f7a388a (patch)
tree2d06527f08a030f59be0164020e38a3428a54192
parent21073429bc190562bcc2b1c38577e60553b4bff6 (diff)
downloadpoky-e2328da34446317313d6a121c778a39a5f7a388a.tar.gz
ca-certificates: Fix postinst dependency issues
We were relying on running ca-certificates from the -native version. This meant the host and target path layouts had to match which might not be true, it certainly isn't true for the sdk builds. There was a dependency on run-parts which wasn't represented (we can get it from busybox or debianutils). Since this is an allarch script, call the script directly, making sure debianutils and openssl are available as postinst rootfs time to resolve the issues. (From OE-Core rev: d9575e05f2cb8bf293534c036ddc0d0336701256) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/ca-certificates/ca-certificates_20161130.bb11
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20161130.bb b/meta/recipes-support/ca-certificates/ca-certificates_20161130.bb
index 9a80f43371..fa72f71af9 100644
--- a/meta/recipes-support/ca-certificates/ca-certificates_20161130.bb
+++ b/meta/recipes-support/ca-certificates/ca-certificates_20161130.bb
@@ -8,10 +8,11 @@ LICENSE = "GPL-2.0+ & MPL-2.0"
8LIC_FILES_CHKSUM = "file://debian/copyright;md5=e7358b9541ccf3029e9705ed8de57968" 8LIC_FILES_CHKSUM = "file://debian/copyright;md5=e7358b9541ccf3029e9705ed8de57968"
9 9
10# This is needed to ensure we can run the postinst at image creation time 10# This is needed to ensure we can run the postinst at image creation time
11DEPENDS = "ca-certificates-native" 11DEPENDS = ""
12DEPENDS_class-native = "openssl-native" 12DEPENDS_class-native = "openssl-native"
13DEPENDS_class-nativesdk = "ca-certificates-native openssl-native" 13DEPENDS_class-nativesdk = "openssl-native"
14PACKAGE_WRITE_DEPS += "ca-certificates-native" 14# Need c_rehash from openssl and run-parts from debianutils
15PACKAGE_WRITE_DEPS += "openssl-native debianutils-native"
15 16
16SRCREV = "adc13592b55ef00450412d61a2145d162a4afb19" 17SRCREV = "adc13592b55ef00450412d61a2145d162a4afb19"
17PR = "r20170717" 18PR = "r20170717"
@@ -64,7 +65,7 @@ do_install_append_class-target () {
64} 65}
65 66
66pkg_postinst_${PN} () { 67pkg_postinst_${PN} () {
67 SYSROOT="$D" update-ca-certificates 68 SYSROOT="$D" $D${sbindir}/update-ca-certificates
68} 69}
69 70
70CONFFILES_${PN} += "${sysconfdir}/ca-certificates.conf" 71CONFFILES_${PN} += "${sysconfdir}/ca-certificates.conf"
@@ -72,7 +73,7 @@ CONFFILES_${PN} += "${sysconfdir}/ca-certificates.conf"
72# Postinsts don't seem to be run for nativesdk packages when populating SDKs. 73# Postinsts don't seem to be run for nativesdk packages when populating SDKs.
73CONFFILES_${PN}_append_class-nativesdk = " ${sysconfdir}/ssl/certs/ca-certificates.crt" 74CONFFILES_${PN}_append_class-nativesdk = " ${sysconfdir}/ssl/certs/ca-certificates.crt"
74do_install_append_class-nativesdk () { 75do_install_append_class-nativesdk () {
75 SYSROOT="${D}${SDKPATHNATIVE}" update-ca-certificates 76 SYSROOT="${D}${SDKPATHNATIVE}" ${D}${sbindir}/update-ca-certificates
76} 77}
77 78
78do_install_append_class-native () { 79do_install_append_class-native () {