diff --git a/Makefile b/Makefile index 26f58cc1ec..c00211176e 100755 --- a/Makefile +++ b/Makefile @@ -35,11 +35,6 @@ NOSE_ARGS ?= --stop ZIP_TYPE := $(shell if [ "$(ZIP_DEV)" == "true" ]; then echo '-dev'; else echo ''; fi) -CARGO_HOME := /root/.cargo -SCCACHE_CACHE_SIZE" := 40G, -SCCACHE_DIR := /root/.cache, -RUSTC_WRAPPER := /root/.cargo/bin/sccache - all: copr-rpms rpms device-scanner-rpms iml-gui-rpm docker-rpms local: diff --git a/vagrant/scripts/build_rust_rpms.sh b/vagrant/scripts/build_rust_rpms.sh index 31334f7a34..755f6fbd35 100644 --- a/vagrant/scripts/build_rust_rpms.sh +++ b/vagrant/scripts/build_rust_rpms.sh @@ -3,6 +3,20 @@ yum install -y cargo rpm-build [ -f /root/.cargo/bin/sccache ] && echo "sccache already installed. Skipping." || cargo install sccache +sed -i '/^export CARGO_HOME/d' /root/.bash_profile +sed -i '/^export SCCACHE_CACHE_SIZE/d' /root/.bash_profile +sed -i '/^export SCCACHE_DIR/d' /root/.bash_profile +sed -i '/^export RUSTC_WRAPPER/d' /root/.bash_profile + +cat <> /root/.bash_profile +export CARGO_HOME=/root/.cargo +export SCCACHE_CACHE_SIZE=40G +export SCCACHE_DIR=/root/.cache +export RUSTC_WRAPPER=/root/.cargo/bin/sccache +EOF + +source /root/.bash_profile + cd /integrated-manager-for-lustre \ && sed -i 's/Release: 1.*/Release: 1.'"$(date '+%s')"'/g' rust-iml.spec \ && make copr-rpms