summaryrefslogtreecommitdiffstats
path: root/classes/image_types_ostree.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'classes/image_types_ostree.bbclass')
-rw-r--r--classes/image_types_ostree.bbclass6
1 files changed, 5 insertions, 1 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index d2feb50..0db8e50 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -194,7 +194,7 @@ IMAGE_CMD_ostreepush () {
194} 194}
195 195
196IMAGE_TYPEDEP_garagesign = "ostreepush" 196IMAGE_TYPEDEP_garagesign = "ostreepush"
197do_image_garage_sign[depends] += "aktualizr-native:do_populate_sysroot" 197do_image_garagesign[depends] += "aktualizr-native:do_populate_sysroot"
198IMAGE_CMD_garagesign () { 198IMAGE_CMD_garagesign () {
199 if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then 199 if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
200 # if credentials are issued by a server that doesn't support offline signing, exit silently 200 # if credentials are issued by a server that doesn't support offline signing, exit silently
@@ -220,6 +220,10 @@ IMAGE_CMD_garagesign () {
220 target_version=${ostree_target_hash} 220 target_version=${ostree_target_hash}
221 if [ -n "${GARAGE_TARGET_VERSION}" ]; then 221 if [ -n "${GARAGE_TARGET_VERSION}" ]; then
222 target_version=${GARAGE_TARGET_VERSION} 222 target_version=${GARAGE_TARGET_VERSION}
223 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"
224 elif [ -e "${STAGING_DATADIR_NATIVE}/target_version" ]; then
225 target_version=$(cat "${STAGING_DATADIR_NATIVE}/target_version")
226 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"
223 fi 227 fi
224 228
225 # Push may fail due to race condition when multiple build machines try to push simultaneously 229 # Push may fail due to race condition when multiple build machines try to push simultaneously