summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2018-11-28 09:47:54 +0100
committerStefan Agner <stefan.agner@toradex.com>2018-11-28 12:42:21 +0100
commitd13ec585ae677affd88b9d92c6ea135cc249b2fa (patch)
tree042a3a792c76d30483f69e55d8f4d3b58b435a6a
parent73e15405ee32bcc33b6ef1a1a525e2b22bc641fe (diff)
downloadmeta-updater-d13ec585ae677affd88b9d92c6ea135cc249b2fa.tar.gz
image_types_ostree: use OSTree repo location for lockfiles
OSTree does not allow concurrent access to the repository. If two bitbake instances use the same OSTree repository, then they might access it simultanously. The lockfile to prevent such simultaneous access should really be in the same location where the OSTree repository is stored. Revert back to the location inside the OSTree repository. Fixes: e97975d6113c ("image_types_ostree/ota.bbclass: refactor ostree task") Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
-rw-r--r--classes/image_types_ostree.bbclass2
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
130IMAGE_TYPEDEP_ostreecommit = "ostree" 130IMAGE_TYPEDEP_ostreecommit = "ostree"
131do_image_ostreecommit[depends] += "ostree-native:do_populate_sysroot" 131do_image_ostreecommit[depends] += "ostree-native:do_populate_sysroot"
132do_image_ostreecommit[lockfiles] += "${WORKDIR}/${OSTREE_REPO}-commit.lock" 132do_image_ostreecommit[lockfiles] += "${OSTREE_REPO}/ostree.lock"
133IMAGE_CMD_ostreecommit () { 133IMAGE_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