summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2020-02-10 09:55:19 +0100
committerGitHub <noreply@github.com>2020-02-10 09:55:19 +0100
commitb7817c31a5c2096259be9715b44bd750a1d44acf (patch)
tree351ae7f51bc8bff2fb4d194106148f71a265181a
parent88e00ad4e16c5a5ed78026557ded2f9e86aa688a (diff)
parent3c009a79a1ee57cf6896f650514f22a8229e09d4 (diff)
downloadmeta-updater-b7817c31a5c2096259be9715b44bd750a1d44acf.tar.gz
Merge pull request #679 from agners/ostree-add-version-metadata-zeus
image_types_ostree: set version metadata field
-rw-r--r--classes/image_types_ostree.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index 0f0fd28..7e4a367 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -5,6 +5,7 @@ OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}"
5OSTREE_ROOTFS ??= "${WORKDIR}/ostree-rootfs" 5OSTREE_ROOTFS ??= "${WORKDIR}/ostree-rootfs"
6OSTREE_COMMIT_SUBJECT ??= "Commit-id: ${IMAGE_NAME}" 6OSTREE_COMMIT_SUBJECT ??= "Commit-id: ${IMAGE_NAME}"
7OSTREE_COMMIT_BODY ??= "" 7OSTREE_COMMIT_BODY ??= ""
8OSTREE_COMMIT_VERSION ??= "${DISTRO_VERSION}"
8OSTREE_UPDATE_SUMMARY ??= "0" 9OSTREE_UPDATE_SUMMARY ??= "0"
9OSTREE_DEPLOY_DEVICETREE ??= "0" 10OSTREE_DEPLOY_DEVICETREE ??= "0"
10 11
@@ -169,6 +170,7 @@ IMAGE_CMD_ostreecommit () {
169 --branch=${OSTREE_BRANCHNAME} \ 170 --branch=${OSTREE_BRANCHNAME} \
170 --subject="${OSTREE_COMMIT_SUBJECT}" \ 171 --subject="${OSTREE_COMMIT_SUBJECT}" \
171 --body="${OSTREE_COMMIT_BODY}" \ 172 --body="${OSTREE_COMMIT_BODY}" \
173 --add-metadata-string=version="${OSTREE_COMMIT_VERSION}" \
172 --bind-ref="${OSTREE_BRANCHNAME}-${IMAGE_BASENAME}" 174 --bind-ref="${OSTREE_BRANCHNAME}-${IMAGE_BASENAME}"
173 175
174 if [ "${OSTREE_UPDATE_SUMMARY}" = "1" ]; then 176 if [ "${OSTREE_UPDATE_SUMMARY}" = "1" ]; then