[PATCH v2 4/6] meta/dpkg: Move 'do_build' and buildchroot stuff to dpkg-base.bbclass

[Henning Schild <henning.schild@siemens.com>]

Issue:
'do_build' contains the steps we need to "enter" and "exit" BUILDCHROOT
to build packages in there. Other classes that build debian packages
might need that as well but can not use it as long as it is in
dkpg.bbclass.

Change:
Pull 'do_build' and all the buildchroot related stuff out of
dpkg.bbclass and into dpkg-base.bbclass. All that remains is the
implementation of the function dpkg_build().

Impact:
This patch does not change the behaviour of Isar. It addresses the issue
and prepares for another patch.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 meta/classes/dpkg-base.bbclass | 25 +++++++++++++++++++++++++
 meta/classes/dpkg.bbclass      | 20 --------------------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index 64fd0e8..2402858 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -1,6 +1,31 @@
 # This software is a part of ISAR.
 # Copyright (C) 2017 Siemens AG
 
+# Add dependency from buildchroot creation
+DEPENDS += "buildchroot"
+do_build[deptask] = "do_build"
+
+# Each package should have its own unique build folder, so use
+# recipe name as identifier
+PP = "/home/builder/${PN}"
+
+BUILDROOT = "${BUILDCHROOT_DIR}/${PP}"
+do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
+
+# default to "emtpy" implementation
+dpkg_runbuild() {
+    die "This should never be called, overwrite it in your derived class"
+}
+
+# Wrap the function dpkg_runbuild with the bind mount for buildroot
+do_build() {
+    mkdir -p ${BUILDROOT}
+    sudo mount --bind ${WORKDIR} ${BUILDROOT}
+    dpkg_runbuild
+    sudo umount ${BUILDROOT}
+    rm -rf ${BUILDROOT}
+}
+
 # Install package to dedicated deploy directory
 do_install() {
     install -m 644 ${WORKDIR}/*.deb ${DEPLOY_DIR_DEB}/
diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass
index 5c3c1f8..c10f5ba 100644
--- a/meta/classes/dpkg.bbclass
+++ b/meta/classes/dpkg.bbclass
@@ -3,27 +3,7 @@
 
 inherit dpkg-base
 
-# Add dependency from buildchroot creation
-DEPENDS += "buildchroot"
-do_build[deptask] = "do_build"
-
-# Each package should have its own unique build folder, so use
-# recipe name as identifier
-PP = "/home/builder/${PN}"
-
-BUILDROOT = "${BUILDCHROOT_DIR}/${PP}"
-do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
-
 # Build package from sources using build script
 dpkg_runbuild() {
     sudo chroot ${BUILDCHROOT_DIR} /build.sh ${PP}/${SRC_DIR}
 }
-
-# Wrap the function dpkg_runbuild with the bind mount for buildroot
-do_build() {
-    mkdir -p ${BUILDROOT}
-    sudo mount --bind ${WORKDIR} ${BUILDROOT}
-    dpkg_runbuild
-    sudo umount ${BUILDROOT}
-    rm -rf ${BUILDROOT}
-}
-- 
2.13.5