diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/image_types_ostree.bbclass | 8 | ||||
| -rw-r--r-- | classes/image_types_ota.bbclass | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index cf2e52f..f350449 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | inherit image | 3 | inherit image |
| 4 | 4 | ||
| 5 | IMAGE_DEPENDS_ostree = "ostree-native:do_populate_sysroot \ | 5 | do_image_ostree[depends] += "ostree-native:do_populate_sysroot \ |
| 6 | openssl-native:do_populate_sysroot \ | 6 | openssl-native:do_populate_sysroot \ |
| 7 | coreutils-native:do_populate_sysroot \ | 7 | coreutils-native:do_populate_sysroot \ |
| 8 | unzip-native:do_populate_sysroot \ | 8 | unzip-native:do_populate_sysroot \ |
| @@ -162,7 +162,7 @@ IMAGE_CMD_ostree () { | |||
| 162 | } | 162 | } |
| 163 | 163 | ||
| 164 | IMAGE_TYPEDEP_ostreepush = "ostree" | 164 | IMAGE_TYPEDEP_ostreepush = "ostree" |
| 165 | IMAGE_DEPENDS_ostreepush = "aktualizr-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot " | 165 | do_image_ostreepush[depends] += "aktualizr-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot" |
| 166 | IMAGE_CMD_ostreepush () { | 166 | IMAGE_CMD_ostreepush () { |
| 167 | # Print warnings if credetials are not set or if the file has not been found. | 167 | # Print warnings if credetials are not set or if the file has not been found. |
| 168 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then | 168 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then |
| @@ -180,7 +180,7 @@ IMAGE_CMD_ostreepush () { | |||
| 180 | } | 180 | } |
| 181 | 181 | ||
| 182 | IMAGE_TYPEDEP_garagesign = "ostreepush" | 182 | IMAGE_TYPEDEP_garagesign = "ostreepush" |
| 183 | IMAGE_DEPENDS_garagesign = "aktualizr-native:do_populate_sysroot" | 183 | do_image_garage_sign[depends] += "aktualizr-native:do_populate_sysroot" |
| 184 | IMAGE_CMD_garagesign () { | 184 | IMAGE_CMD_garagesign () { |
| 185 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then | 185 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then |
| 186 | # if credentials are issued by a server that doesn't support offline signing, exit silently | 186 | # if credentials are issued by a server that doesn't support offline signing, exit silently |
| @@ -225,7 +225,7 @@ IMAGE_CMD_garagesign () { | |||
| 225 | } | 225 | } |
| 226 | 226 | ||
| 227 | IMAGE_TYPEDEP_garagecheck = "ostreepush garagesign" | 227 | IMAGE_TYPEDEP_garagecheck = "ostreepush garagesign" |
| 228 | IMAGE_DEPENDS_garagecheck = "aktualizr-native:do_populate_sysroot" | 228 | do_image_garagecheck[depends] += "aktualizr-native:do_populate_sysroot" |
| 229 | IMAGE_CMD_garagecheck () { | 229 | IMAGE_CMD_garagecheck () { |
| 230 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then | 230 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then |
| 231 | # if credentials are issued by a server that doesn't support offline signing, exit silently | 231 | # if credentials are issued by a server that doesn't support offline signing, exit silently |
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index 5dc4811..b827444 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass | |||
| @@ -11,7 +11,7 @@ inherit image | |||
| 11 | 11 | ||
| 12 | OSTREE_BOOTLOADER ??= 'u-boot' | 12 | OSTREE_BOOTLOADER ??= 'u-boot' |
| 13 | 13 | ||
| 14 | IMAGE_DEPENDS_otaimg = "e2fsprogs-native:do_populate_sysroot \ | 14 | do_image_otaimg[depends] += "e2fsprogs-native:do_populate_sysroot \ |
| 15 | ${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER', True) == 'grub' else ''} \ | 15 | ${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER', True) == 'grub' else ''} \ |
| 16 | ${@'virtual/bootloader:do_deploy' if d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot' else ''}" | 16 | ${@'virtual/bootloader:do_deploy' if d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot' else ''}" |
| 17 | 17 | ||
