[PATCH v4 4/5] dpkg-base: Clean up unmounting in do_dpkg_build()

[Anton Mikanovich <amikan@ilbers.de>]

Reverting d21d49578e5a "dpkg: Make mount buildroot reliable" brings back
two problems:

* The filesystems mounted under buildchroot (dev, proc, sys, etc.) are
  left mounted.

* If dpkg_runbuild() fails, WORKDIR and the filesystems under
  buildchroot are left mounted.

Request unmounting the filesystems under buildchroot after every package
build. The actual unmounting will be done after the last job due to the
reference counting.

Also request unmounting in any case, even if building fails.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 meta/classes/dpkg-base.bbclass | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index 105a1e6..fe814e0 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -169,6 +169,8 @@ dpkg_undo_mounts() {
         i=`expr $i + 1`
     done
     sudo rmdir ${BUILDROOT}
+
+    buildchroot_undo_mounts
 }
 
 # Placeholder for actual dpkg_runbuild() implementation
@@ -180,9 +182,11 @@ python do_dpkg_build() {
     lock = bb.utils.lockfile(d.getVar("REPO_ISAR_DIR") + "/isar.lock",
                              shared=True)
     bb.build.exec_func("dpkg_do_mounts", d)
-    bb.build.exec_func("dpkg_runbuild", d)
-    bb.build.exec_func("dpkg_undo_mounts", d)
-    bb.utils.unlockfile(lock)
+    try:
+        bb.build.exec_func("dpkg_runbuild", d)
+    finally:
+        bb.build.exec_func("dpkg_undo_mounts", d)
+        bb.utils.unlockfile(lock)
 }
 
 addtask dpkg_build before do_build
-- 
2.25.1