Skip to content
This repository has been archived by the owner on Jul 25, 2022. It is now read-only.

Commit

Permalink
Move environment variables from Makefile into the .bash_profile of th…
Browse files Browse the repository at this point in the history
…e adm node and resource it before running make.

Signed-off-by: johnsonw <wjohnson@whamcloud.com>
  • Loading branch information
johnsonw committed Nov 19, 2020
1 parent 86bcfba commit 6ad5033
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
5 changes: 0 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
14 changes: 14 additions & 0 deletions vagrant/scripts/build_rust_rpms.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <<EOF >> /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

0 comments on commit 6ad5033

Please sign in to comment.