From f1689ba27ff8940e57573ad195d349e84be5732a Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Wed, 8 Nov 2017 12:25:19 +0100 Subject: Fix ca-certificates-native dependency. /etc is not added to the sysroot by default, so force it. Also, move the dependency to where it is actually used. --- classes/image_types_ostree.bbclass | 2 +- recipes-sota/aktualizr/aktualizr_git.bb | 1 - recipes-support/ca-certificates/ca-certificates_%.bbappend | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 recipes-support/ca-certificates/ca-certificates_%.bbappend diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 1f8e195..dcc6fc9 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass @@ -159,7 +159,7 @@ IMAGE_CMD_ostree () { } IMAGE_TYPEDEP_ostreepush = "ostree" -IMAGE_DEPENDS_ostreepush = "aktualizr-native:do_populate_sysroot" +IMAGE_DEPENDS_ostreepush = "aktualizr-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot " IMAGE_CMD_ostreepush () { # Print warnings if credetials are not set or if the file has not been found. if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 7831ae8..470c9bf 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb @@ -10,7 +10,6 @@ DEPENDS_append_class-target = "jansson ostree ${@bb.utils.contains('SOTA_CLIENT_ DEPENDS_append_class-native = "glib-2.0-native " RDEPENDS_${PN}_class-target = "lshw " -RDEPENDS_${PN}_class-native = "ca-certificates-native " RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', ' engine-pkcs11', '', d)} " RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm-test', ' softhsm softhsm-testtoken', '', d)} " diff --git a/recipes-support/ca-certificates/ca-certificates_%.bbappend b/recipes-support/ca-certificates/ca-certificates_%.bbappend new file mode 100644 index 0000000..afaadfd --- /dev/null +++ b/recipes-support/ca-certificates/ca-certificates_%.bbappend @@ -0,0 +1 @@ +SYSROOT_DIRS += "/etc" -- cgit v1.2.3-54-g00ecf