summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorMing Liu <liu.ming50@gmail.com>2018-11-11 13:35:26 +0100
committerMing Liu <liu.ming50@gmail.com>2018-11-24 12:12:25 +0100
commit4eaec14b8204ab5cb2e4a3fa2f19c39326909101 (patch)
tree8399b274409223eee8745767d6af4c9fa6f8d20d /classes
parentc72d82867d4dd7e2dddaea24e1e56b2349f1af03 (diff)
downloadmeta-updater-4eaec14b8204ab5cb2e4a3fa2f19c39326909101.tar.gz
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 <liu.ming50@gmail.com>
Diffstat (limited to 'classes')
-rw-r--r--classes/image_types_ostree.bbclass7
1 files 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 @@
1# OSTree deployment 1# OSTree deployment
2 2
3do_image_ostree[depends] += "ostree-native:do_populate_sysroot \ 3do_image_ostree[depends] += "ostree-native:do_populate_sysroot \
4 openssl-native:do_populate_sysroot \
5 coreutils-native:do_populate_sysroot \ 4 coreutils-native:do_populate_sysroot \
6 unzip-native:do_populate_sysroot \
7 virtual/kernel:do_deploy \ 5 virtual/kernel:do_deploy \
8 ${INITRAMFS_IMAGE}:do_image_complete \ 6 ${INITRAMFS_IMAGE}:do_image_complete \
9" 7"
@@ -188,7 +186,7 @@ IMAGE_CMD_ostreepush () {
188} 186}
189 187
190IMAGE_TYPEDEP_garagesign = "ostreepush" 188IMAGE_TYPEDEP_garagesign = "ostreepush"
191do_image_garagesign[depends] += "aktualizr-native:do_populate_sysroot" 189do_image_garagesign[depends] += "unzip-native:do_populate_sysroot"
192IMAGE_CMD_garagesign () { 190IMAGE_CMD_garagesign () {
193 if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then 191 if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
194 # if credentials are issued by a server that doesn't support offline signing, exit silently 192 # if credentials are issued by a server that doesn't support offline signing, exit silently
@@ -254,8 +252,7 @@ IMAGE_CMD_garagesign () {
254 fi 252 fi
255} 253}
256 254
257IMAGE_TYPEDEP_garagecheck = "ostreepush garagesign" 255IMAGE_TYPEDEP_garagecheck = "garagesign"
258do_image_garagecheck[depends] += "aktualizr-native:do_populate_sysroot"
259IMAGE_CMD_garagecheck () { 256IMAGE_CMD_garagecheck () {
260 if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then 257 if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
261 # if credentials are issued by a server that doesn't support offline signing, exit silently 258 # if credentials are issued by a server that doesn't support offline signing, exit silently