diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2019-01-08 10:04:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-08 10:04:12 +0100 |
| commit | 9a5cdcb2dfdedbf92562938d6c03f08a036cf274 (patch) | |
| tree | d1e097e2c0969cef7882c2ec02a5c000cd0ddfac | |
| parent | 8fc8152334a167e9fd4f84dd76c8abf2470eb0a0 (diff) | |
| parent | 03ed45db93f511ee5fbc766436d5330ca33bf278 (diff) | |
| download | meta-updater-9a5cdcb2dfdedbf92562938d6c03f08a036cf274.tar.gz | |
Merge pull request #451 from advancedtelematic/fix/OTA-1866/simultaneous-garage-sign
image_garagesign: Use a lock to fix concurrency problems.
| -rw-r--r-- | classes/image_types_ostree.bbclass | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 0820af7..5cb4d51 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
| @@ -169,6 +169,9 @@ IMAGE_CMD_ostreepush () { | |||
| 169 | 169 | ||
| 170 | IMAGE_TYPEDEP_garagesign = "ostreepush" | 170 | IMAGE_TYPEDEP_garagesign = "ostreepush" |
| 171 | do_image_garagesign[depends] += "unzip-native:do_populate_sysroot" | 171 | do_image_garagesign[depends] += "unzip-native:do_populate_sysroot" |
| 172 | # This lock solves OTA-1866, which is that removing GARAGE_SIGN_REPO while using | ||
| 173 | # garage-sign simultaneously for two images often causes problems. | ||
| 174 | do_image_garagesign[lockfiles] += "${DEPLOY_DIR_IMAGE}/garagesign.lock" | ||
| 172 | IMAGE_CMD_garagesign () { | 175 | IMAGE_CMD_garagesign () { |
| 173 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then | 176 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then |
| 174 | # if credentials are issued by a server that doesn't support offline signing, exit silently | 177 | # if credentials are issued by a server that doesn't support offline signing, exit silently |