summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2018-11-05 10:56:29 +0100
committerGitHub <noreply@github.com>2018-11-05 10:56:29 +0100
commit1a3336314a0efe0609461010b6ea68f5f6e61173 (patch)
tree30d6404c2c3e474028e769ea254a4662e2b22ac5 /classes
parentfdbf88415985ac4543bdf8737cc4607e489fa04f (diff)
parente98d6f2fe469cd8e6380d45fdb17e81bc02ba2a3 (diff)
downloadmeta-updater-1a3336314a0efe0609461010b6ea68f5f6e61173.tar.gz
Merge pull request #422 from LM555/feat/commit_subj_body
Added support to set custom commit subject and body
Diffstat (limited to 'classes')
-rw-r--r--classes/image_types_ostree.bbclass11
1 files changed, 10 insertions, 1 deletions
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
16OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" 16OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}"
17 17
18OSTREE_COMMIT_SUBJECT ??= "Commit-id: ${IMAGE_NAME}"
19OSTREE_COMMIT_BODY ??= ""
20OSTREE_UPDATE_SUMMARY ??= "0"
21
18export SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd', 'true', '')}" 22export SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd', 'true', '')}"
19 23
20IMAGE_CMD_ostree () { 24IMAGE_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}