From d0eee09fdc30431a85142be615844efa6b969201 Mon Sep 17 00:00:00 2001 From: phanes Date: Sat, 18 Feb 2023 22:19:08 -0500 Subject: [PATCH] dependency checks on 2.2 --- Makefile | 4 +++- make.project/dirs.sh | 2 -- rex.project/x86_64/environments/stage1.env.bash | 14 +++++++++++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a3fbed0..379ab58 100644 --- a/Makefile +++ b/Makefile @@ -13,8 +13,10 @@ else # these need run in the following order: clean: - ${dir_make}/clean.sh + sudo /usr/bin/env -i bash -c ". ./project_config.sh && ${dir_make}/clean.sh" +purge_artifacts: + ${dir_make}/purge_artifacts.sh dirs: ${dir_make}/dirs.sh diff --git a/make.project/dirs.sh b/make.project/dirs.sh index 015289f..61477ff 100755 --- a/make.project/dirs.sh +++ b/make.project/dirs.sh @@ -1,10 +1,8 @@ - function echofail() { echo $1 exit 1 } - function mkfaildir() { echo "Creating directory '$1'." mkdir -p $1 || echofail "Failed to create '$1' directory." diff --git a/rex.project/x86_64/environments/stage1.env.bash b/rex.project/x86_64/environments/stage1.env.bash index c9b9b88..bd44698 100755 --- a/rex.project/x86_64/environments/stage1.env.bash +++ b/rex.project/x86_64/environments/stage1.env.bash @@ -1,2 +1,14 @@ -TERM=xterm +set -a +TERM=xterm-256color +COLORTERM=truecolor +PATH= +LANG=C +PATH=/usr/lib64/ccache:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin + +function echofail() { + echo + echo "FAILED: $1" + echo + exit 1 +}