[PATCH v2 07/12] classes/dpkg*: Drop hardcoded buildchroot blobs

[Alexander Smirnov <asmirnov@ilbers.de>]

This patch makes possible to parametrize the chroot will be actually
used by dpkg-base class.

Signed-off-by: Alexander Smirnov <asmirnov@ilbers.de>
---
 meta/classes/dpkg-base.bbclass | 14 +++++++-------
 meta/classes/dpkg-raw.bbclass  |  4 +++-
 meta/classes/dpkg.bbclass      |  4 +++-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index 24fe2ca..0668e25 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -31,7 +31,7 @@ def get_package_srcdir(d):
 PP = "/home/builder/${PN}"
 PPS ?= "${@get_package_srcdir(d)}"
 
-BUILDROOT = "${BUILDCHROOT_DIR}/${PP}"
+BUILDROOT = "${ROOTFS_DIR}/${PP}"
 do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
 
 # default to "emtpy" implementation
@@ -39,7 +39,7 @@ dpkg_runbuild() {
     die "This should never be called, overwrite it in your derived class"
 }
 
-MOUNT_LOCKFILE = "${BUILDCHROOT_DIR}/mount.lock"
+MOUNT_LOCKFILE = "${ROOTFS_DIR}/mount.lock"
 
 # Wrap the function dpkg_runbuild with the bind mount for buildroot
 do_build() {
@@ -47,11 +47,11 @@ do_build() {
     sudo mount --bind ${WORKDIR} ${BUILDROOT}
 
     sudo flock ${MOUNT_LOCKFILE} -c ' \
-        if ! grep -q ${BUILDCHROOT_DIR}/isar-apt /proc/mounts; then \
-            mount --bind ${DEPLOY_DIR_APT}/${DISTRO} ${BUILDCHROOT_DIR}/isar-apt; \
-            mount --bind ${DL_DIR} ${BUILDCHROOT_DIR}/downloads; \
-            mount -t devtmpfs -o mode=0755,nosuid devtmpfs ${BUILDCHROOT_DIR}/dev; \
-            mount -t proc none ${BUILDCHROOT_DIR}/proc; \
+        if ! grep -q ${ROOTFS_DIR}/isar-apt /proc/mounts; then \
+            mount --bind ${DEPLOY_DIR_APT}/${DISTRO} ${ROOTFS_DIR}/isar-apt; \
+            mount --bind ${DL_DIR} ${ROOTFS_DIR}/downloads; \
+            mount -t devtmpfs -o mode=0755,nosuid devtmpfs ${ROOTFS_DIR}/dev; \
+            mount -t proc none ${ROOTFS_DIR}/proc; \
         fi'
 
     dpkg_runbuild
diff --git a/meta/classes/dpkg-raw.bbclass b/meta/classes/dpkg-raw.bbclass
index 5c7be6b..1b661a7 100644
--- a/meta/classes/dpkg-raw.bbclass
+++ b/meta/classes/dpkg-raw.bbclass
@@ -9,6 +9,8 @@ MAINTAINER ?= "FIXME Unknown maintainer"
 # Add dependency from buildchroot creation
 do_build[depends] = "buildchroot:do_build"
 
+ROOTFS_DIR = "${BUILDCHROOT_DIR}"
+
 D = "${WORKDIR}/image/"
 
 # Populate folder that will be picked up as package
@@ -59,5 +61,5 @@ addtask deb_package_conffiles after do_deb_package_prepare before do_build
 
 dpkg_runbuild() {
 	sudo chown -R root:root ${D}/DEBIAN/
-	sudo chroot ${BUILDCHROOT_DIR} dpkg-deb --build ${PP}/image ${PP}
+	sudo chroot ${ROOTFS_DIR} dpkg-deb --build ${PP}/image ${PP}
 }
diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass
index c483fe2..195174a 100644
--- a/meta/classes/dpkg.bbclass
+++ b/meta/classes/dpkg.bbclass
@@ -6,8 +6,10 @@ inherit dpkg-base
 # Add dependency from buildchroot creation
 do_build[depends] = "buildchroot:do_build"
 
+ROOTFS_DIR = "${BUILDCHROOT_DIR}"
+
 # Build package from sources using build script
 dpkg_runbuild() {
     E="${@ bb.utils.export_proxies(d)}"
-    sudo -E chroot ${BUILDCHROOT_DIR} /build.sh ${PP}/${PPS}
+    sudo -E chroot ${ROOTFS_DIR} /build.sh ${PP}/${PPS}
 }
-- 
2.1.4