diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2018-11-28 15:10:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-28 15:10:08 +0100 |
| commit | 2e1eb5bf5ff232dd197e7891aee6efd42b6c27a0 (patch) | |
| tree | 042a3a792c76d30483f69e55d8f4d3b58b435a6a | |
| parent | 73e15405ee32bcc33b6ef1a1a525e2b22bc641fe (diff) | |
| parent | d13ec585ae677affd88b9d92c6ea135cc249b2fa (diff) | |
| download | meta-updater-2e1eb5bf5ff232dd197e7891aee6efd42b6c27a0.tar.gz | |
Merge pull request #439 from agners/fix-ostree-lockfiles
image_types_ostree: use OSTree repo location for lockfiles
| -rw-r--r-- | classes/image_types_ostree.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 41b8d0d..ff807a4 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
| @@ -129,7 +129,7 @@ IMAGE_CMD_ostree () { | |||
| 129 | 129 | ||
| 130 | IMAGE_TYPEDEP_ostreecommit = "ostree" | 130 | IMAGE_TYPEDEP_ostreecommit = "ostree" |
| 131 | do_image_ostreecommit[depends] += "ostree-native:do_populate_sysroot" | 131 | do_image_ostreecommit[depends] += "ostree-native:do_populate_sysroot" |
| 132 | do_image_ostreecommit[lockfiles] += "${WORKDIR}/${OSTREE_REPO}-commit.lock" | 132 | do_image_ostreecommit[lockfiles] += "${OSTREE_REPO}/ostree.lock" |
| 133 | IMAGE_CMD_ostreecommit () { | 133 | IMAGE_CMD_ostreecommit () { |
| 134 | if ! ostree --repo=${OSTREE_REPO} refs 2>&1 > /dev/null; then | 134 | if ! ostree --repo=${OSTREE_REPO} refs 2>&1 > /dev/null; then |
| 135 | ostree --repo=${OSTREE_REPO} init --mode=archive-z2 | 135 | ostree --repo=${OSTREE_REPO} init --mode=archive-z2 |