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 95d1b59..5a17096 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -184,7 +184,7 @@ IMAGE_CMD_ostreepush () { | |||
184 | } | 184 | } |
185 | 185 | ||
186 | IMAGE_TYPEDEP_garagesign = "ostreepush" | 186 | IMAGE_TYPEDEP_garagesign = "ostreepush" |
187 | do_image_garage_sign[depends] += "aktualizr-native:do_populate_sysroot" | 187 | do_image_garagesign[depends] += "aktualizr-native:do_populate_sysroot" |
188 | IMAGE_CMD_garagesign () { | 188 | IMAGE_CMD_garagesign () { |
189 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then | 189 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then |
190 | # if credentials are issued by a server that doesn't support offline signing, exit silently | 190 | # if credentials are issued by a server that doesn't support offline signing, exit silently |
@@ -210,6 +210,10 @@ IMAGE_CMD_garagesign () { | |||
210 | target_version=${ostree_target_hash} | 210 | target_version=${ostree_target_hash} |
211 | if [ -n "${GARAGE_TARGET_VERSION}" ]; then | 211 | if [ -n "${GARAGE_TARGET_VERSION}" ]; then |
212 | target_version=${GARAGE_TARGET_VERSION} | 212 | target_version=${GARAGE_TARGET_VERSION} |
213 | 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" | ||
214 | elif [ -e "${STAGING_DATADIR_NATIVE}/target_version" ]; then | ||
215 | target_version=$(cat "${STAGING_DATADIR_NATIVE}/target_version") | ||
216 | 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" | ||
213 | fi | 217 | fi |
214 | 218 | ||
215 | # Push may fail due to race condition when multiple build machines try to push simultaneously | 219 | # Push may fail due to race condition when multiple build machines try to push simultaneously |