diff options
Diffstat (limited to 'classes/image_types_ostree.bbclass')
-rw-r--r-- | classes/image_types_ostree.bbclass | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 7ffe99d..0f0fd28 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -13,11 +13,11 @@ BUILD_OSTREE_TARBALL ??= "1" | |||
13 | SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'systemd', 'true', '')}" | 13 | SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'systemd', 'true', '')}" |
14 | 14 | ||
15 | IMAGE_CMD_TAR = "tar --xattrs --xattrs-include=*" | 15 | IMAGE_CMD_TAR = "tar --xattrs --xattrs-include=*" |
16 | CONVERSION_CMD_tar = "touch ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}; ${IMAGE_CMD_TAR} --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.tar -C ${OTA_IMAGE_ROOTFS} . || [ $? -eq 1 ]" | 16 | CONVERSION_CMD_tar = "touch ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}; ${IMAGE_CMD_TAR} --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.tar -C ${TAR_IMAGE_ROOTFS} . || [ $? -eq 1 ]" |
17 | CONVERSIONTYPES_append = " tar" | 17 | CONVERSIONTYPES_append = " tar" |
18 | 18 | ||
19 | REQUIRED_DISTRO_FEATURES = "usrmerge" | 19 | REQUIRED_DISTRO_FEATURES = "usrmerge" |
20 | OTA_IMAGE_ROOTFS_task-image-ostree = "${OSTREE_ROOTFS}" | 20 | TAR_IMAGE_ROOTFS_task-image-ostree = "${OSTREE_ROOTFS}" |
21 | do_image_ostree[dirs] = "${OSTREE_ROOTFS}" | 21 | do_image_ostree[dirs] = "${OSTREE_ROOTFS}" |
22 | do_image_ostree[cleandirs] = "${OSTREE_ROOTFS}" | 22 | do_image_ostree[cleandirs] = "${OSTREE_ROOTFS}" |
23 | do_image_ostree[depends] = "coreutils-native:do_populate_sysroot virtual/kernel:do_deploy ${INITRAMFS_IMAGE}:do_image_complete" | 23 | do_image_ostree[depends] = "coreutils-native:do_populate_sysroot virtual/kernel:do_deploy ${INITRAMFS_IMAGE}:do_image_complete" |
@@ -186,13 +186,20 @@ IMAGE_CMD_ostreecommit () { | |||
186 | IMAGE_TYPEDEP_ostreepush = "ostreecommit" | 186 | IMAGE_TYPEDEP_ostreepush = "ostreecommit" |
187 | do_image_ostreepush[depends] += "aktualizr-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot" | 187 | do_image_ostreepush[depends] += "aktualizr-native:do_populate_sysroot ca-certificates-native:do_populate_sysroot" |
188 | IMAGE_CMD_ostreepush () { | 188 | IMAGE_CMD_ostreepush () { |
189 | # Print warnings if credetials are not set or if the file has not been found. | 189 | # send a copy of the repo manifest to backend if available |
190 | local SEND_MANIFEST="" | ||
191 | # check if garage-push supports the --repo-manifest option before trying | ||
192 | if $(garage-push --help | grep -q '^\s*--repo-manifest') && [ -f ${IMAGE_ROOTFS}${sysconfdir}/manifest.xml ]; then | ||
193 | SEND_MANIFEST="--repo-manifest ${IMAGE_ROOTFS}${sysconfdir}/manifest.xml" | ||
194 | fi | ||
195 | |||
190 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then | 196 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then |
191 | if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then | 197 | if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then |
192 | garage-push -vv --repo=${OSTREE_REPO} \ | 198 | garage-push -vv --repo=${OSTREE_REPO} \ |
193 | --ref=${OSTREE_BRANCHNAME} \ | 199 | --ref=${OSTREE_BRANCHNAME} \ |
194 | --credentials=${SOTA_PACKED_CREDENTIALS} \ | 200 | --credentials=${SOTA_PACKED_CREDENTIALS} \ |
195 | --cacert=${STAGING_ETCDIR_NATIVE}/ssl/certs/ca-certificates.crt | 201 | --cacert=${STAGING_ETCDIR_NATIVE}/ssl/certs/ca-certificates.crt \ |
202 | $SEND_MANIFEST | ||
196 | else | 203 | else |
197 | bbwarn "SOTA_PACKED_CREDENTIALS file does not exist." | 204 | bbwarn "SOTA_PACKED_CREDENTIALS file does not exist." |
198 | fi | 205 | fi |