diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2020-02-07 09:35:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-07 09:35:33 +0100 |
| commit | 6eef6a93107b5d50fc2c3e227c2754db30dbb51a (patch) | |
| tree | 72e8b99ae006dda12ed6b1b83ea665b7bce7b20e /classes | |
| parent | 24d225af5f7b6e061a1e2e7da5c9b1926e93f62a (diff) | |
| parent | 65b51c44666af05be600c5c768293888a4437647 (diff) | |
| download | meta-updater-6eef6a93107b5d50fc2c3e227c2754db30dbb51a.tar.gz | |
Merge pull request #670 from agners/ostree-add-version-metadata
image_types_ostree: set version metadata field
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/image_types_ostree.bbclass | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index f3f9c08..d32aae5 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
| @@ -7,6 +7,7 @@ OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" | |||
| 7 | OSTREE_ROOTFS ??= "${WORKDIR}/ostree-rootfs" | 7 | OSTREE_ROOTFS ??= "${WORKDIR}/ostree-rootfs" |
| 8 | OSTREE_COMMIT_SUBJECT ??= "Commit-id: ${IMAGE_NAME}" | 8 | OSTREE_COMMIT_SUBJECT ??= "Commit-id: ${IMAGE_NAME}" |
| 9 | OSTREE_COMMIT_BODY ??= "" | 9 | OSTREE_COMMIT_BODY ??= "" |
| 10 | OSTREE_COMMIT_VERSION ??= "${DISTRO_VERSION}" | ||
| 10 | OSTREE_UPDATE_SUMMARY ??= "0" | 11 | OSTREE_UPDATE_SUMMARY ??= "0" |
| 11 | OSTREE_DEPLOY_DEVICETREE ??= "0" | 12 | OSTREE_DEPLOY_DEVICETREE ??= "0" |
| 12 | 13 | ||
| @@ -170,6 +171,7 @@ IMAGE_CMD_ostreecommit () { | |||
| 170 | --branch=${OSTREE_BRANCHNAME} \ | 171 | --branch=${OSTREE_BRANCHNAME} \ |
| 171 | --subject="${OSTREE_COMMIT_SUBJECT}" \ | 172 | --subject="${OSTREE_COMMIT_SUBJECT}" \ |
| 172 | --body="${OSTREE_COMMIT_BODY}" \ | 173 | --body="${OSTREE_COMMIT_BODY}" \ |
| 174 | --add-metadata-string=version="${OSTREE_COMMIT_VERSION}" \ | ||
| 173 | --bind-ref="${OSTREE_BRANCHNAME}-${IMAGE_BASENAME}" | 175 | --bind-ref="${OSTREE_BRANCHNAME}-${IMAGE_BASENAME}" |
| 174 | 176 | ||
| 175 | if [ "${OSTREE_UPDATE_SUMMARY}" = "1" ]; then | 177 | if [ "${OSTREE_UPDATE_SUMMARY}" = "1" ]; then |
