[PATCH] [RFC] buildchroot: Fix do_setup_mounts

[Alexander Smirnov <asmirnov@ilbers.de>]

Fix this function to work correctly for re-running builds.

Signed-off-by: Alexander Smirnov <asmirnov@ilbers.de>
---
 meta/recipes-devtools/buildchroot/buildchroot.bb | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb
index 570c0ad..d25b549 100644
--- a/meta/recipes-devtools/buildchroot/buildchroot.bb
+++ b/meta/recipes-devtools/buildchroot/buildchroot.bb
@@ -74,20 +74,16 @@ do_build() {
     do_cleanup_mounts
 }
 
-# Invalidate stamp for do_setup_mounts before each build start.
-# This will guarantee that this function will be executed once
-# per build.
-python __anonymous() {
-    stamp = d.getVar("STAMP") + ".do_setup_mounts." + d.getVarFlag("do_setup_mounts", 'stamp-extra-info')
-    os.remove(stamp) if os.path.exists(stamp) else None
-}
-
-do_setup_mounts[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
+do_setup_mounts[nostamp] = "1"
+do_setup_mounts[lockfiles] = "${WORKDIR}/isar.lock"
 
 do_setup_mounts() {
-    sudo mount --bind ${DEPLOY_DIR_APT}/${DISTRO} ${BUILDCHROOT_DIR}/isar-apt
-    sudo mount -t devtmpfs -o mode=0755,nosuid devtmpfs ${BUILDCHROOT_DIR}/dev
-    sudo mount -t proc none ${BUILDCHROOT_DIR}/proc
+    grep -q ${BUILDCHROOT_DIR}/isar-apt /proc/mounts || \
+        sudo mount --bind ${DEPLOY_DIR_APT}/${DISTRO} ${BUILDCHROOT_DIR}/isar-apt
+    grep -q ${BUILDCHROOT_DIR}/dev /proc/mounts || \
+        sudo mount -t devtmpfs -o mode=0755,nosuid devtmpfs ${BUILDCHROOT_DIR}/dev
+    grep -q ${BUILDCHROOT_DIR}/proc /proc/mounts || \
+        sudo mount -t proc none ${BUILDCHROOT_DIR}/proc
 }
 
 addtask setup_mounts after do_build
-- 
2.1.4