From 0a9b89297afadbf6bb8a4b4980f6112767b2116e Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Wed, 13 Dec 2017 19:20:48 +0200 Subject: [PATCH] fix generation of --- BUILD/mdbci/build.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/BUILD/mdbci/build.sh b/BUILD/mdbci/build.sh index 7437a8ff0..abdb0f4b2 100755 --- a/BUILD/mdbci/build.sh +++ b/BUILD/mdbci/build.sh @@ -25,7 +25,9 @@ export script_dir="$(dirname $(readlink -f $0))" # load all needed variables . ${script_dir}/set_build_variables.sh -dist_sfx="$platform"."$platform_version" +export platform=`${mdbci_dir}/mdbci show boxinfo --box-name=$box --field='platform' --silent` +export platform_version=`${mdbci_dir}/mdbci show boxinfo --box-name=$box --field='platform_version' --silent` +export dist_sfx="$platform"."$platform_version" export cmake_flags="${cmake_flags} -DPACKAGE=Y -DDISTRIB_SUFFIX=${dist_sfx}" # prerare VM @@ -33,9 +35,6 @@ export provider=`${mdbci_dir}/mdbci show provider $box --silent 2> /dev/null` export name="$box-${JOB_NAME}-${BUILD_NUMBER}" export name=`echo $name | sed "s|/|-|g"` -export platform=`${mdbci_dir}/mdbci show boxinfo --box-name=$box --field='platform' --silent` -export platform_version=`${mdbci_dir}/mdbci show boxinfo --box-name=$box --field='platform_version' --silent` - if [ "${try_already_running}" == "yes" ]; then export name=${box}