summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2020-01-28 22:05:14 +0000
committerStefan Agner <stefan.agner@toradex.com>2020-02-09 19:21:34 +0000
commit3c009a79a1ee57cf6896f650514f22a8229e09d4 (patch)
tree351ae7f51bc8bff2fb4d194106148f71a265181a
parent88e00ad4e16c5a5ed78026557ded2f9e86aa688a (diff)
downloadmeta-updater-3c009a79a1ee57cf6896f650514f22a8229e09d4.tar.gz
image_types_ostree: set version metadata field
OSTree uses the "version" metadata field in various places, e.g. in ostree admin status. Use DISTRO_VERSION as default version number source. This gives a more human readable version number to a particular OSTree: $ ostree admin status * torizon f1825d8a8f89c48cc0915ea059bd23463a97655757a53ae0ab0fe7a97e1ebeb2.0 Version: 3.0+snapshot-20200128 origin refspec: f1825d8a8f89c48cc0915ea059bd23463a97655757a53ae0ab0fe7a97e1ebeb Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
-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