diff options
author | Luka Pivk <luka.pivk@toradex.com> | 2018-10-11 20:31:40 +0200 |
---|---|---|
committer | Luka Pivk <luka.pivk@toradex.com> | 2018-10-24 18:15:21 +0200 |
commit | 2af450bc64021c2ebc2e82a59a209e56276bad4f (patch) | |
tree | a75e27d1a913cdb073acf6f8d8f29f848874e4b7 | |
parent | 441c6527710005c0cc676ae3e688c8e63fe6ee7d (diff) | |
download | meta-updater-2af450bc64021c2ebc2e82a59a209e56276bad4f.tar.gz |
Added support to automatically update ostree summary
Use OSTREE_UPDATE_SUMMARY to automatically update summary after committing
to ostree repo
Signed-off-by: Luka Pivk <luka.pivk@toradex.com>
-rw-r--r-- | README.adoc | 3 | ||||
-rw-r--r-- | classes/image_types_ostree.bbclass | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/README.adoc b/README.adoc index 03a588a..3f9c392 100644 --- a/README.adoc +++ b/README.adoc | |||
@@ -78,6 +78,9 @@ Although we have used U-Boot so far, other boot loaders can be configured work w | |||
78 | 78 | ||
79 | * `OSTREE_REPO` - path to your OSTree repository. Defaults to `$\{DEPLOY_DIR_IMAGE}/ostree_repo` | 79 | * `OSTREE_REPO` - path to your OSTree repository. Defaults to `$\{DEPLOY_DIR_IMAGE}/ostree_repo` |
80 | * `OSTREE_OSNAME` - OS deployment name on your target device. For more information about deployments and osnames see the https://ostree.readthedocs.io/en/latest/manual/deployment/[OSTree documentation]. Defaults to "poky". | 80 | * `OSTREE_OSNAME` - OS deployment name on your target device. For more information about deployments and osnames see the https://ostree.readthedocs.io/en/latest/manual/deployment/[OSTree documentation]. Defaults to "poky". |
81 | * `OSTREE_COMMIT_BODY` - Message attached to OSTree commit. Empty by default. | ||
82 | * `OSTREE_COMMIT_SUBJECT` - Commit subject used by OSTree. Defaults to `Commit-id: ${IMAGE_NAME}` | ||
83 | * `OSTREE_UPDATE_SUMMARY` - Set this to '1' to update summary of OSTree repository on each commit. '0' by default. | ||
81 | * `INITRAMFS_IMAGE` - initramfs/initrd image that is used as a proxy while booting into OSTree deployment. Do not change this setting unless you are sure that your initramfs can serve as such a proxy. | 84 | * `INITRAMFS_IMAGE` - initramfs/initrd image that is used as a proxy while booting into OSTree deployment. Do not change this setting unless you are sure that your initramfs can serve as such a proxy. |
82 | * `SOTA_PACKED_CREDENTIALS` - when set, your ostree commit will be pushed to a remote repo as a bitbake step. This should be the path to a zipped credentials file in https://github.com/advancedtelematic/aktualizr/blob/master/docs/credentials.adoc[the format accepted by garage-push]. | 85 | * `SOTA_PACKED_CREDENTIALS` - when set, your ostree commit will be pushed to a remote repo as a bitbake step. This should be the path to a zipped credentials file in https://github.com/advancedtelematic/aktualizr/blob/master/docs/credentials.adoc[the format accepted by garage-push]. |
83 | * `SOTA_DEPLOY_CREDENTIALS` - when set to '1' (default value), deploys credentials to the built image. Override it in `local.conf` to built a generic image that can be provisioned manually after the build. | 86 | * `SOTA_DEPLOY_CREDENTIALS` - when set to '1' (default value), deploys credentials to the built image. Override it in `local.conf` to built a generic image that can be provisioned manually after the build. |
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index af87e28..3bf2d0e 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -16,6 +16,7 @@ OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" | |||
16 | 16 | ||
17 | OSTREE_COMMIT_SUBJECT ??= "Commit-id: ${IMAGE_NAME}" | 17 | OSTREE_COMMIT_SUBJECT ??= "Commit-id: ${IMAGE_NAME}" |
18 | OSTREE_COMMIT_BODY ??= "" | 18 | OSTREE_COMMIT_BODY ??= "" |
19 | OSTREE_UPDATE_SUMMARY ??= "0" | ||
19 | 20 | ||
20 | export SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd', 'true', '')}" | 21 | export SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd', 'true', '')}" |
21 | 22 | ||
@@ -165,7 +166,11 @@ IMAGE_CMD_ostree () { | |||
165 | --branch=${OSTREE_BRANCHNAME} \ | 166 | --branch=${OSTREE_BRANCHNAME} \ |
166 | --subject="${OSTREE_COMMIT_SUBJECT}" \ | 167 | --subject="${OSTREE_COMMIT_SUBJECT}" \ |
167 | --body="${OSTREE_COMMIT_BODY}" | 168 | --body="${OSTREE_COMMIT_BODY}" |
168 | 169 | ||
170 | if [ "${OSTREE_UPDATE_SUMMARY}" = "1" ]; then | ||
171 | ostree --repo=${OSTREE_REPO} summary -u | ||
172 | fi | ||
173 | |||
169 | rm -rf ${OSTREE_ROOTFS} | 174 | rm -rf ${OSTREE_ROOTFS} |
170 | } | 175 | } |
171 | 176 | ||