X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fbuild-tools.git;a=blobdiff_plain;f=create_mock_config.sh;h=f05dfdc1d093238328ef332d5355586ef00550ac;hp=701cbc1cdcac2674a9f2aff73231df4b87d43aeb;hb=HEAD;hpb=4ded4f2a805e9447be90751d7d4fb7e11552e545

diff --git a/create_mock_config.sh b/create_mock_config.sh
index 701cbc1..f05dfdc 100755
--- a/create_mock_config.sh
+++ b/create_mock_config.sh
@@ -17,10 +17,11 @@ set -e
 
 scriptdir="$(dirname $(readlink -f ${BASH_SOURCE[0]}))"
 source $scriptdir/lib.sh
+_read_manifest_vars
 
 config_ini=${1:-$BUILD_CONFIG_INI}
 output_repo_files_dir=${2:-$REPO_FILES}
-output_mock_dir=${2:-$(dirname $RPM_BUILDER_SETTINGS)}
+output_mock_dir=${2:-$output_repo_files_dir}
 [ -f "$config_ini" ] || _abort "Config INI '$config_ini' not found"
 
 # Create .repo files
@@ -33,10 +34,13 @@ cp $LIBDIR/mock/site-defaults.cfg $output_mock_dir/
 mock_cfg=$output_mock_dir/mock.cfg
 sed -e "/#REPOSITORIES#/r $output_repo_files_dir/repositories.repo" $LIBDIR/mock/mock.cfg.template > $mock_cfg
 sed -i \
+  -e "s/#RPM_ARCH#/\"$(uname -m)\"/" \
   -e "s/#RPM_PACKAGER#/\"$(_read_build_config $config_ini rpm packager)\"/" \
   -e "s/#RPM_VENDOR#/\"$(_read_build_config $config_ini rpm vendor)\"/" \
   -e "s/#RPM_LICENSE#/\"$(_read_build_config $config_ini rpm license)\"/" \
   -e "s/#RPM_RELEASE_ID#/\"$(_read_build_config $config_ini rpm release_id)\"/" \
+  -e "s/#PRODUCT_RELEASE_BUILD_ID#/\"$PRODUCT_RELEASE_BUILD_ID\"/" \
+  -e "s/#PRODUCT_RELEASE_LABEL#/\"$PRODUCT_RELEASE_LABEL\"/" \
   $mock_cfg
 
 docker_sock=/var/run/docker.sock