diff options
Diffstat (limited to 'classes/image_types_ostree.bbclass')
-rw-r--r-- | classes/image_types_ostree.bbclass | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index bc44e33..1ac848d 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -178,7 +178,7 @@ IMAGE_CMD_ostreepush () { | |||
178 | } | 178 | } |
179 | 179 | ||
180 | IMAGE_TYPEDEP_garagesign = "ostreepush" | 180 | IMAGE_TYPEDEP_garagesign = "ostreepush" |
181 | do_image_garage_sign[depends] += "aktualizr-native:do_populate_sysroot" | 181 | do_image_garagesign[depends] += "aktualizr-native:do_populate_sysroot" |
182 | IMAGE_CMD_garagesign () { | 182 | IMAGE_CMD_garagesign () { |
183 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then | 183 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then |
184 | # if credentials are issued by a server that doesn't support offline signing, exit silently | 184 | # if credentials are issued by a server that doesn't support offline signing, exit silently |
@@ -204,6 +204,8 @@ IMAGE_CMD_garagesign () { | |||
204 | target_version=${ostree_target_hash} | 204 | target_version=${ostree_target_hash} |
205 | if [ -n "${GARAGE_TARGET_VERSION}" ]; then | 205 | if [ -n "${GARAGE_TARGET_VERSION}" ]; then |
206 | target_version=${GARAGE_TARGET_VERSION} | 206 | target_version=${GARAGE_TARGET_VERSION} |
207 | elif [ -e "${STAGING_DATADIR_NATIVE}/target_version" ]; then | ||
208 | target_version=$(cat "${STAGING_DATADIR_NATIVE}/target_version") | ||
207 | fi | 209 | fi |
208 | 210 | ||
209 | # Push may fail due to race condition when multiple build machines try to push simultaneously | 211 | # Push may fail due to race condition when multiple build machines try to push simultaneously |