[PATCH v3 3/5] dpkg: Allow overriding build and host parameters for sbuild and schroot

["Koch, Stefan" <stefan-koch@siemens.com>]

This functionality is initially used for custom linux builds using the
"-compat" and "-native" multiarch bitbake targets to run additional
target or host specific builds for kbuild scripts and tools.

Signed-off-by: Stefan Koch <stefan-koch@siemens.com>
---
 meta/classes/dpkg-base.bbclass | 19 ++++++++++++++++++-
 meta/classes/dpkg.bbclass      |  2 +-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index 7b02f378..eaeb0e8b 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -208,7 +208,7 @@ dpkg_runbuild() {
 
 def isar_deb_build_profiles(d):
     deb_build_profiles = d.getVar('DEB_BUILD_PROFILES')
-    if d.getVar('ISAR_CROSS_COMPILE') == "1":
+    if d.getVar('ISAR_CROSS_COMPILE') == "1" and d.getVar('ISAR_SKIP_CROSS_PROFILE') != "1":
         deb_build_profiles += ' cross'
     return deb_build_profiles.strip()
 
@@ -223,6 +223,23 @@ def isar_export_build_settings(d):
     os.environ['DEB_BUILD_PROFILES'] = isar_deb_build_profiles(d)
 
 python do_dpkg_build() {
+    schroot_dir_override = d.getVar('SCHROOT_DIR_OVERRIDE', True)
+    sbuild_build_override = d.getVar('SBUILD_BUILD_OVERRIDE', True)
+    sbuild_host_override = d.getVar('SBUILD_HOST_OVERRIDE', True)
+
+    if schroot_dir_override:
+        d.setVar('SCHROOT_DIR', schroot_dir_override)
+
+    if sbuild_build_override:
+        d.setVar('SBUILD_BUILD', sbuild_build_override)
+    else:
+        d.setVar('SBUILD_BUILD', d.getVar('BUILD_HOST_ARCH', True))
+
+    if sbuild_host_override:
+        d.setVar('SBUILD_HOST', sbuild_host_override)
+    else:
+        d.setVar('SBUILD_HOST', d.getVar('PACKAGE_ARCH', True))
+
     bb.build.exec_func('schroot_create_configs', d)
     try:
         bb.build.exec_func("dpkg_runbuild", d)
diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass
index c596adbf..7d659741 100644
--- a/meta/classes/dpkg.bbclass
+++ b/meta/classes/dpkg.bbclass
@@ -102,7 +102,7 @@ dpkg_runbuild() {
     DSC_FILE=$(find ${WORKDIR} -name "${DEB_SOURCE_NAME}*.dsc" -print)
 
     sbuild -A -n -c ${SBUILD_CHROOT} --extra-repository="${ISAR_APT_REPO}" \
-        --host=${PACKAGE_ARCH} --build=${BUILD_HOST_ARCH} ${profiles} \
+        --host=${SBUILD_HOST} --build=${SBUILD_BUILD} ${profiles} \
         --no-run-lintian --no-run-piuparts --no-run-autopkgtest --resolve-alternatives \
         --bd-uninstallable-explainer=apt \
         --no-apt-update \
-- 
2.39.2