[PATCH v2 10/12] dpkg: Resolve dep from buildchroot

[Alexander Smirnov <asmirnov@ilbers.de>]

Automatically resolve the dependency from native or cross buildchroot.

Signed-off-by: Alexander Smirnov <asmirnov@ilbers.de>
---
 meta/classes/dpkg-base.bbclass  | 16 ++++++++++++++++
 meta/classes/dpkg-cross.bbclass |  7 ++-----
 meta/classes/dpkg-raw.bbclass   |  5 -----
 meta/classes/dpkg.bbclass       |  7 ++-----
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index 0668e25..ad440ad 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -1,6 +1,22 @@
 # This software is a part of ISAR.
 # Copyright (C) 2017 Siemens AG
 
+ISAR_CROSS_COMPILE ?= "0"
+
+# Add dependency from the correct buildchroot: cross or native
+python __anonymous() {
+    mode = d.getVar('ISAR_CROSS_COMPILE', True)
+    if mode == "0":
+        dep = "buildchroot:do_build"
+        rootfs = d.getVar('BUILDCHROOT_DIR', True)
+    else:
+        dep = "buildchroot-cross:do_build"
+        rootfs = d.getVar('BUILDCHROOT_CROSS_DIR', True)
+
+    d.setVarFlag('do_build', 'depends', dep)
+    d.setVar('ROOTFS_DIR', rootfs)
+}
+
 do_adjust_git() {
     if [ -f ${S}/.git/objects/info/alternates ]; then
         sed -i ${S}/.git/objects/info/alternates \
diff --git a/meta/classes/dpkg-cross.bbclass b/meta/classes/dpkg-cross.bbclass
index 7e5a1fd..f097dec 100644
--- a/meta/classes/dpkg-cross.bbclass
+++ b/meta/classes/dpkg-cross.bbclass
@@ -1,12 +1,9 @@
 # This software is a part of ISAR.
 # Copyright (C) 2015-2018 ilbers GmbH
 
-inherit dpkg-base
-
-# Add dependency from buildchroot creation
-do_build[depends] = "buildchroot-cross:do_build"
+ISAR_CROSS_COMPILE := "1"
 
-ROOTFS_DIR="${BUILDCHROOT_CROSS_DIR}"
+inherit dpkg-base
 
 # Build package from sources using build script
 dpkg_runbuild() {
diff --git a/meta/classes/dpkg-raw.bbclass b/meta/classes/dpkg-raw.bbclass
index 1b661a7..a6865e7 100644
--- a/meta/classes/dpkg-raw.bbclass
+++ b/meta/classes/dpkg-raw.bbclass
@@ -6,11 +6,6 @@ inherit dpkg-base
 DEBIAN_DEPENDS ?= ""
 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
diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass
index 87ffbce..5420289 100644
--- a/meta/classes/dpkg.bbclass
+++ b/meta/classes/dpkg.bbclass
@@ -1,12 +1,9 @@
 # This software is a part of ISAR.
 # Copyright (C) 2015-2016 ilbers GmbH
 
-inherit dpkg-base
-
-# Add dependency from buildchroot creation
-do_build[depends] = "buildchroot:do_build"
+ISAR_CROSS_COMPILE := "0"
 
-ROOTFS_DIR = "${BUILDCHROOT_DIR}"
+inherit dpkg-base
 
 # Build package from sources using build script
 dpkg_runbuild() {
-- 
2.1.4