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