File _service:gitpkg:0017-Pass-additional-variables-... of Package build

Overview Repositories Revisions Requests Users Attributes Meta

File _service:gitpkg:0017-Pass-additional-variables-to-sb2-build-even-if-VM_TY.patch of Package build

From be56e2e3fc8568d03df67873d375a8861cd9f541 Mon Sep 17 00:00:00 2001
From: Oleg Girko <oleg.girko@jolla.com>
Date: Mon, 13 Jan 2014 01:02:11 +0000
Subject: [PATCH] Pass additional variables to sb2 build even if VM_TYPE is not
 sb2.

This can happen when building with sb2 using kvm virtualisation.
In this case VM_TYPE variable will be equal to "kvm",
so we detect sb2 build by presence of BUILD_SB2FLAGS non-empty variable.

Signed-off-by: Oleg Girko <oleg.girko@jolla.com>
---
 build-vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-vm b/build-vm
index 6985fc4..912856a 100644
--- a/build-vm
+++ b/build-vm
@@ -691,7 +691,7 @@ vm_first_stage() {
     # put our config into .build/build.data
     Q="'\''"
     echo "RECIPEFILE='${RECIPEFILE//"'"/$Q}'" > $BUILD_ROOT/.build/build.data
-    if test "$VM_TYPE" = lxc -o "VM_TYPE" = docker -o "$VM_TYPE" = sb2; then
+    if test "$VM_TYPE" = lxc -o "VM_TYPE" = docker -o "$VM_TYPE" = sb2 -o -n "$BUILD_SB2FLAGS"; then
 	# abuild user equivalence is useful
 	echo "ABUILD_UID='${ABUILD_UID//"'"/$Q}'" >> $BUILD_ROOT/.build/build.data
 	echo "ABUILD_GID='${ABUILD_GID//"'"/$Q}'" >> $BUILD_ROOT/.build/build.data
-- 
2.1.0

Places

File _service:gitpkg:0017-Pass-additional-variables-to-sb2-build-even-if-VM_TY.patch of Package build

Places