summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuka Pivk <luka.pivk@toradex.com>2018-10-04 10:39:31 +0200
committerLuka Pivk <luka.pivk@toradex.com>2018-10-24 18:11:39 +0200
commit441c6527710005c0cc676ae3e688c8e63fe6ee7d (patch)
treebf94bb4d4d52bf189d21cc0408ab8886853991f3
parenta880e393dfe00efc82217616fb1797bdf2028286 (diff)
downloadmeta-updater-441c6527710005c0cc676ae3e688c8e63fe6ee7d.tar.gz
Added support to set custom commit subject and body
Use OSTREE_COMMIT_BODY write custom text to ostree body Use OSTREE_COMMIT_SUBJECT to write custom subject Signed-off-by: Luka Pivk <luka.pivk@toradex.com>
-rw-r--r--classes/image_types_ostree.bbclass8
1 files changed, 6 insertions, 2 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index a5d43dc..af87e28 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -14,6 +14,9 @@ export GARAGE_TARGET_NAME
14 14
15OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" 15OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}"
16 16
17OSTREE_COMMIT_SUBJECT ??= "Commit-id: ${IMAGE_NAME}"
18OSTREE_COMMIT_BODY ??= ""
19
17export SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd', 'true', '')}" 20export SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd', 'true', '')}"
18 21
19IMAGE_CMD_ostree () { 22IMAGE_CMD_ostree () {
@@ -160,8 +163,9 @@ IMAGE_CMD_ostree () {
160 --tree=dir=${OSTREE_ROOTFS} \ 163 --tree=dir=${OSTREE_ROOTFS} \
161 --skip-if-unchanged \ 164 --skip-if-unchanged \
162 --branch=${OSTREE_BRANCHNAME} \ 165 --branch=${OSTREE_BRANCHNAME} \
163 --subject="Commit-id: ${IMAGE_NAME}" 166 --subject="${OSTREE_COMMIT_SUBJECT}" \
164 167 --body="${OSTREE_COMMIT_BODY}"
168
165 rm -rf ${OSTREE_ROOTFS} 169 rm -rf ${OSTREE_ROOTFS}
166} 170}
167 171