diff options
-rw-r--r-- | README.adoc | 3 | ||||
-rw-r--r-- | classes/image_types_ostree.bbclass | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/README.adoc b/README.adoc index aadad2d..2485801 100644 --- a/README.adoc +++ b/README.adoc | |||
@@ -79,6 +79,9 @@ Although we have used U-Boot so far, other boot loaders can be configured work w | |||
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_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. | 81 | * `OSTREE_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 | * `OSTREE_COMMIT_BODY` - Message attached to OSTree commit. Empty by default. | ||
83 | * `OSTREE_COMMIT_SUBJECT` - Commit subject used by OSTree. Defaults to `Commit-id: ${IMAGE_NAME}` | ||
84 | * `OSTREE_UPDATE_SUMMARY` - Set this to '1' to update summary of OSTree repository on each commit. '0' by default. | ||
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. |
84 | * `SOTA_CLIENT_PROV` - which provisioning method to use. Valid options are https://github.com/advancedtelematic/aktualizr/blob/master/docs/automatic-provisioning.adoc[`aktualizr-auto-prov`], https://github.com/advancedtelematic/aktualizr/blob/master/docs/implicit-provisioning.adoc[`aktualizr-ca-implicit-prov`], and https://github.com/advancedtelematic/aktualizr/blob/master/docs/hsm-provisioning.adoc[`aktualizr-hsm-prov`]. The default is `aktualizr-auto-prov`. This can also be set to an empty string to avoid using a provisioning recipe. | 87 | * `SOTA_CLIENT_PROV` - which provisioning method to use. Valid options are https://github.com/advancedtelematic/aktualizr/blob/master/docs/automatic-provisioning.adoc[`aktualizr-auto-prov`], https://github.com/advancedtelematic/aktualizr/blob/master/docs/implicit-provisioning.adoc[`aktualizr-ca-implicit-prov`], and https://github.com/advancedtelematic/aktualizr/blob/master/docs/hsm-provisioning.adoc[`aktualizr-hsm-prov`]. The default is `aktualizr-auto-prov`. This can also be set to an empty string to avoid using a provisioning recipe. |
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 95d1b59..b2eb61d 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -15,6 +15,10 @@ RAMDISK_EXT ?= ".${OSTREE_INITRAMFS_FSTYPES}" | |||
15 | 15 | ||
16 | OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" | 16 | OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" |
17 | 17 | ||
18 | OSTREE_COMMIT_SUBJECT ??= "Commit-id: ${IMAGE_NAME}" | ||
19 | OSTREE_COMMIT_BODY ??= "" | ||
20 | OSTREE_UPDATE_SUMMARY ??= "0" | ||
21 | |||
18 | export SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd', 'true', '')}" | 22 | export SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd', 'true', '')}" |
19 | 23 | ||
20 | IMAGE_CMD_ostree () { | 24 | IMAGE_CMD_ostree () { |
@@ -160,7 +164,12 @@ IMAGE_CMD_ostree () { | |||
160 | --tree=dir=${OSTREE_ROOTFS} \ | 164 | --tree=dir=${OSTREE_ROOTFS} \ |
161 | --skip-if-unchanged \ | 165 | --skip-if-unchanged \ |
162 | --branch=${OSTREE_BRANCHNAME} \ | 166 | --branch=${OSTREE_BRANCHNAME} \ |
163 | --subject="Commit-id: ${IMAGE_NAME}" | 167 | --subject="${OSTREE_COMMIT_SUBJECT}" \ |
168 | --body="${OSTREE_COMMIT_BODY}" | ||
169 | |||
170 | if [ "${OSTREE_UPDATE_SUMMARY}" = "1" ]; then | ||
171 | ostree --repo=${OSTREE_REPO} summary -u | ||
172 | fi | ||
164 | 173 | ||
165 | rm -rf ${OSTREE_ROOTFS} | 174 | rm -rf ${OSTREE_ROOTFS} |
166 | } | 175 | } |