diff options
Diffstat (limited to 'classes/image_types_ostree.bbclass')
-rw-r--r-- | classes/image_types_ostree.bbclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 0f0fd28..533d338 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -5,6 +5,7 @@ OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" | |||
5 | OSTREE_ROOTFS ??= "${WORKDIR}/ostree-rootfs" | 5 | OSTREE_ROOTFS ??= "${WORKDIR}/ostree-rootfs" |
6 | OSTREE_COMMIT_SUBJECT ??= "Commit-id: ${IMAGE_NAME}" | 6 | OSTREE_COMMIT_SUBJECT ??= "Commit-id: ${IMAGE_NAME}" |
7 | OSTREE_COMMIT_BODY ??= "" | 7 | OSTREE_COMMIT_BODY ??= "" |
8 | OSTREE_COMMIT_VERSION ??= "${DISTRO_VERSION}" | ||
8 | OSTREE_UPDATE_SUMMARY ??= "0" | 9 | OSTREE_UPDATE_SUMMARY ??= "0" |
9 | OSTREE_DEPLOY_DEVICETREE ??= "0" | 10 | OSTREE_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 |
@@ -236,10 +238,10 @@ IMAGE_CMD_garagesign () { | |||
236 | target_version=${ostree_target_hash} | 238 | target_version=${ostree_target_hash} |
237 | if [ -n "${GARAGE_TARGET_VERSION}" ]; then | 239 | if [ -n "${GARAGE_TARGET_VERSION}" ]; then |
238 | target_version=${GARAGE_TARGET_VERSION} | 240 | target_version=${GARAGE_TARGET_VERSION} |
239 | bbwarn "Target version is overriden with GARAGE_TARGET_VERSION variable. It is a dangerous operation, make sure you've read the respective secion in meta-updater/README.adoc" | 241 | bbwarn "Target version is overriden with GARAGE_TARGET_VERSION variable. This is a dangerous operation! See https://docs.ota.here.com/ota-client/latest/build-configuration.html#_overriding_target_version" |
240 | elif [ -e "${STAGING_DATADIR_NATIVE}/target_version" ]; then | 242 | elif [ -e "${STAGING_DATADIR_NATIVE}/target_version" ]; then |
241 | target_version=$(cat "${STAGING_DATADIR_NATIVE}/target_version") | 243 | target_version=$(cat "${STAGING_DATADIR_NATIVE}/target_version") |
242 | bbwarn "Target version is overriden with target_version file. It is a dangerous operation, make sure you've read the respective secion in meta-updater/README.adoc" | 244 | bbwarn "Target version is overriden with target_version file. This is a dangerous operation! See https://docs.ota.here.com/ota-client/latest/build-configuration.html#_overriding_target_version" |
243 | fi | 245 | fi |
244 | 246 | ||
245 | # Push may fail due to race condition when multiple build machines try to push simultaneously | 247 | # Push may fail due to race condition when multiple build machines try to push simultaneously |