[PATCH v2 8/9] dpkg: Use a specific export function in pre-build tasks

[Uladzimir Bely <ubely@ilbers.de>]

Build system like sbuild may not use the system environment, so direct
shell export won't work.

This introduces dpkg_build_export function that may be overloaded in
sbuild or other build systems to be implemented in Isar.

Use it in some recipes like optee-os-stm32mp15x as an alternative
of passing TEE_IMPL_VERSION variable through template mechanism.

Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
 meta-isar/recipes-app/hello/hello.bb                     | 2 +-
 .../recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb   | 2 +-
 meta/classes/dpkg-base.bbclass                           | 9 +++++++++
 meta/classes/dpkg.bbclass                                | 2 +-
 meta/recipes-bsp/libubootenv/libubootenv_0.3-3.bb        | 2 +-
 meta/recipes-kernel/linux/linux-custom.inc               | 2 +-
 6 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/meta-isar/recipes-app/hello/hello.bb b/meta-isar/recipes-app/hello/hello.bb
index d6bdf9bb..dfeea6e9 100644
--- a/meta-isar/recipes-app/hello/hello.bb
+++ b/meta-isar/recipes-app/hello/hello.bb
@@ -25,6 +25,6 @@ do_prepare_build() {
 
 dpkg_runbuild_prepend() {
 	if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then
-		export DEB_BUILD_OPTIONS="nocheck"
+		dpkg_build_export DEB_BUILD_OPTIONS "nocheck"
 	fi
 }
diff --git a/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb b/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb
index 0fa2005d..00b92707 100644
--- a/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb
+++ b/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb
@@ -21,5 +21,5 @@ OPTEE_BINARIES = "tee-header_v2.stm32 tee-pageable_v2.stm32 tee-pager_v2.stm32"
 # Set version manually to PV, the tarball does not contain any hint.
 # Alternative: pull from git and add git as build dependency.
 dpkg_runbuild_prepend() {
-    export TEE_IMPL_VERSION=${PV}
+    dpkg_build_export TEE_IMPL_VERSION ${PV}
 }
diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index 2add0b22..76b1290a 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -196,6 +196,15 @@ dpkg_undo_mounts() {
     sudo rmdir ${BUILDROOT}
 }
 
+# Basic export implementation supporting multiword values
+dpkg_build_export() {
+    var=$1
+    shift
+    value=$@
+
+    export $var="$value"
+}
+
 # Placeholder for actual dpkg_runbuild() implementation
 dpkg_runbuild() {
     die "This should never be called, overwrite it in your derived class"
diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass
index 27fe84f4..e8c7e2eb 100644
--- a/meta/classes/dpkg.bbclass
+++ b/meta/classes/dpkg.bbclass
@@ -33,7 +33,7 @@ addtask devshell after do_install_builddeps
 dpkg_runbuild() {
     E="${@ isar_export_proxies(d)}"
     E="${@ isar_export_ccache(d)}"
-    export PARALLEL_MAKE="${PARALLEL_MAKE}"
+    dpkg_build_export PARALLEL_MAKE "${PARALLEL_MAKE}"
     sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \
          /isar/build.sh ${PP}/${PPS} ${PACKAGE_ARCH}
 }
diff --git a/meta/recipes-bsp/libubootenv/libubootenv_0.3-3.bb b/meta/recipes-bsp/libubootenv/libubootenv_0.3-3.bb
index 68a55003..9cdbb366 100644
--- a/meta/recipes-bsp/libubootenv/libubootenv_0.3-3.bb
+++ b/meta/recipes-bsp/libubootenv/libubootenv_0.3-3.bb
@@ -21,5 +21,5 @@ S = "${WORKDIR}/git"
 
 
 dpkg_runbuild_prepend() {
-	export DEB_BUILD_OPTIONS="nocheck"
+	dpkg_build_export DEB_BUILD_OPTIONS "nocheck"
 }
diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc
index ed89aa09..72706f23 100644
--- a/meta/recipes-kernel/linux/linux-custom.inc
+++ b/meta/recipes-kernel/linux/linux-custom.inc
@@ -180,6 +180,6 @@ dpkg_runbuild_prepend() {
 	if [ "${KERNEL_LIBC_DEV_DEPLOY}" != "1" ]; then
 		profiles="${profiles} nolibcdev"
 	fi
-	export DEB_BUILD_PROFILES="${profiles}"
+	dpkg_build_export DEB_BUILD_PROFILES "${profiles}"
 	dpkg_configure_kernel
 }
-- 
2.20.1