From 4eaec14b8204ab5cb2e4a3fa2f19c39326909101 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Sun, 11 Nov 2018 13:35:26 +0100 Subject: image_types_ostree.bbclass: fix some dependencies issues - unzip-native:do_populate_sysroot should be depended by do_image_garagesign task instead of by do_image_ostree task. - openssl-native:do_populate_sysroot can be removed since it's being depended by aktualizr-native already. - do_image_garagesign and do_image_garagecheck does not have to depend on aktualizr-native:do_populate_sysroot, that dependency is being added by do_image_ostreepush -> aktualizr-native:do_populate_sysroot. - drop ostreepush dependency from IMAGE_TYPEDEP_garagecheck, that is redundant. Signed-off-by: Ming Liu --- classes/image_types_ostree.bbclass | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index ec2de9f..71cacc6 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass @@ -1,9 +1,7 @@ # OSTree deployment do_image_ostree[depends] += "ostree-native:do_populate_sysroot \ - openssl-native:do_populate_sysroot \ coreutils-native:do_populate_sysroot \ - unzip-native:do_populate_sysroot \ virtual/kernel:do_deploy \ ${INITRAMFS_IMAGE}:do_image_complete \ " @@ -188,7 +186,7 @@ IMAGE_CMD_ostreepush () { } IMAGE_TYPEDEP_garagesign = "ostreepush" -do_image_garagesign[depends] += "aktualizr-native:do_populate_sysroot" +do_image_garagesign[depends] += "unzip-native:do_populate_sysroot" IMAGE_CMD_garagesign () { if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then # if credentials are issued by a server that doesn't support offline signing, exit silently @@ -254,8 +252,7 @@ IMAGE_CMD_garagesign () { fi } -IMAGE_TYPEDEP_garagecheck = "ostreepush garagesign" -do_image_garagecheck[depends] += "aktualizr-native:do_populate_sysroot" +IMAGE_TYPEDEP_garagecheck = "garagesign" IMAGE_CMD_garagecheck () { if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then # if credentials are issued by a server that doesn't support offline signing, exit silently -- cgit v1.2.3-54-g00ecf