summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-10-06 13:12:51 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-05 22:39:47 +0000
commitb286ba24f47844a098d5abad6845c4e321bf80e5 (patch)
tree9c34d613c457238f07e341af1b19b44c039212bf
parentcfa154ec74bafc9825f2290b8f70a15b6acb437c (diff)
downloadpoky-b286ba24f47844a098d5abad6845c4e321bf80e5.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: a406704fd68d08c3916b7986f96175be34affc50) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit d9575e05f2cb8bf293534c036ddc0d0336701256) Signed-off-by: André Draszik <adraszik@tycoint.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> 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 42088b9899..c282ace264 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 = "61b70a1007dc269d56881a0d480fc841daacc77c" 17SRCREV = "61b70a1007dc269d56881a0d480fc841daacc77c"
17 18
@@ -63,7 +64,7 @@ do_install_append_class-target () {
63} 64}
64 65
65pkg_postinst_${PN} () { 66pkg_postinst_${PN} () {
66 SYSROOT="$D" update-ca-certificates 67 SYSROOT="$D" $D${sbindir}/update-ca-certificates
67} 68}
68 69
69CONFFILES_${PN} += "${sysconfdir}/ca-certificates.conf" 70CONFFILES_${PN} += "${sysconfdir}/ca-certificates.conf"
@@ -71,7 +72,7 @@ CONFFILES_${PN} += "${sysconfdir}/ca-certificates.conf"
71# Postinsts don't seem to be run for nativesdk packages when populating SDKs. 72# Postinsts don't seem to be run for nativesdk packages when populating SDKs.
72CONFFILES_${PN}_append_class-nativesdk = " ${sysconfdir}/ssl/certs/ca-certificates.crt" 73CONFFILES_${PN}_append_class-nativesdk = " ${sysconfdir}/ssl/certs/ca-certificates.crt"
73do_install_append_class-nativesdk () { 74do_install_append_class-nativesdk () {
74 SYSROOT="${D}${SDKPATHNATIVE}" update-ca-certificates 75 SYSROOT="${D}${SDKPATHNATIVE}" ${D}${sbindir}/update-ca-certificates
75} 76}
76 77
77do_install_append_class-native () { 78do_install_append_class-native () {