[PATCHv2 1/2] cross: use env variables instead of switches

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

Debian has environment variables to set the architectures to be used by
dpkg-buildpackage and mk-build-deps. Use those instead of adding
parameters to the tools.
This patch now also uses the debian names for cross building and we do
not have confusing statements like "--host-arch $target_arch" anymore.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 meta/classes/dpkg.bbclass                         |  6 +++++-
 meta/recipes-devtools/buildchroot/files/build.sh  |  2 +-
 meta/recipes-devtools/buildchroot/files/common.sh | 13 -------------
 meta/recipes-devtools/buildchroot/files/deps.sh   |  4 ++++
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass
index da0b40d..959c041 100644
--- a/meta/classes/dpkg.bbclass
+++ b/meta/classes/dpkg.bbclass
@@ -7,6 +7,8 @@ inherit dpkg-base
 do_install_builddeps() {
     dpkg_do_mounts
     E="${@ bb.utils.export_proxies(d)}"
+    export DEB_HOST_ARCH="${DISTRO_ARCH}"
+    export DEB_BUILD_ARCH="${HOST_ARCH}"
     sudo -E chroot ${BUILDCHROOT_DIR} /isar/deps.sh ${PP}/${PPS} ${DISTRO_ARCH}
     dpkg_undo_mounts
 }
@@ -19,5 +21,7 @@ do_install_builddeps[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
 # Build package from sources using build script
 dpkg_runbuild() {
     E="${@ bb.utils.export_proxies(d)}"
-    sudo -E chroot ${BUILDCHROOT_DIR} /isar/build.sh ${PP}/${PPS} ${DISTRO_ARCH}
+    export DEB_HOST_ARCH="${DISTRO_ARCH}"
+    export DEB_BUILD_ARCH="${HOST_ARCH}"
+    sudo -E chroot ${BUILDCHROOT_DIR} /isar/build.sh ${PP}/${PPS}
 }
diff --git a/meta/recipes-devtools/buildchroot/files/build.sh b/meta/recipes-devtools/buildchroot/files/build.sh
index e74bc14..0458b1f 100644
--- a/meta/recipes-devtools/buildchroot/files/build.sh
+++ b/meta/recipes-devtools/buildchroot/files/build.sh
@@ -15,4 +15,4 @@ for i in configure aclocal.m4 Makefile.am Makefile.in; do
 done
 
 # Build the package
-dpkg-buildpackage -a$target_arch -d --source-option=-I
+dpkg-buildpackage -d --source-option=-I
diff --git a/meta/recipes-devtools/buildchroot/files/common.sh b/meta/recipes-devtools/buildchroot/files/common.sh
index b7551eb..61917b8 100644
--- a/meta/recipes-devtools/buildchroot/files/common.sh
+++ b/meta/recipes-devtools/buildchroot/files/common.sh
@@ -6,19 +6,6 @@
 
 set -e
 
-# Create human-readable names
-target_arch=$2
-
-# Notes:
-#   mk-build-deps for jessie and jtretch has different parameter name to specify
-#   host architecture.
-debian_version=$(cut -c1 /etc/debian_version)
-if [ $(($debian_version)) -ge 9 ]; then
-    set_arch="--host-arch $target_arch"
-else
-    set_arch="-a $target_arch"
-fi
-
 # Go to build directory
 cd $1
 
diff --git a/meta/recipes-devtools/buildchroot/files/deps.sh b/meta/recipes-devtools/buildchroot/files/deps.sh
index 4bd604f..cc34b2d 100644
--- a/meta/recipes-devtools/buildchroot/files/deps.sh
+++ b/meta/recipes-devtools/buildchroot/files/deps.sh
@@ -23,5 +23,9 @@ apt-get update \
     -o Dir::Etc::sourceparts="-" \
     -o APT::Get::List-Cleanup="0"
 
+# according to the man-page --host-arch should default to exactly what we say
+# here ... but it does not, so we have to provide this argument
+set_arch="--host-arch `dpkg-architecture -qDEB_HOST_ARCH`" 
+
 # Install all build deps
 mk-build-deps $set_arch -t "${install_cmd}" -i -r debian/control
-- 
2.19.0