From 1f9ca13476defe8d0c64a0fec515bf906c38feca Mon Sep 17 00:00:00 2001 From: Chris Punches Date: Fri, 9 Feb 2024 01:25:47 -0500 Subject: [PATCH] first step at itemizing dependency checks --- Makefile | 5 ++++ .../x86_64/components/stage1/welcome.bash | 5 +++- rex.project/x86_64/units/stage1.units | 26 +++++++++---------- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 097f362..475a881 100644 --- a/Makefile +++ b/Makefile @@ -47,6 +47,10 @@ download_patches: set -e ${dir_make}/download_patches.sh +dependencies: + set -e + sudo /usr/bin/env -i bash -c ". ./project_config.sh && ${dir_make}/dependencies.sh" + # kicks off rex build_stage1: set -e @@ -121,6 +125,7 @@ all: make clean && \ make dirs && \ make install_rex && \ + make dependencies && \ make download_patches && \ make download_sources && \ make build_stage1 && \ diff --git a/rex.project/x86_64/components/stage1/welcome.bash b/rex.project/x86_64/components/stage1/welcome.bash index cd8fded..798da3a 100755 --- a/rex.project/x86_64/components/stage1/welcome.bash +++ b/rex.project/x86_64/components/stage1/welcome.bash @@ -44,7 +44,10 @@ echo -e "\e[31m$HORSE\e[0m" echo echo "Welcome to Pyrois, the build system for Dark Horse Linux." echo - +>&2 echo +>&2 echo STDERR Pipe Check: +>&2 echo The welcome screen ran, and echoed this to stderr +>&2 echo echo running as: $build_user:$build_group echo echo diff --git a/rex.project/x86_64/units/stage1.units b/rex.project/x86_64/units/stage1.units index 96ac93f..70b6dbe 100644 --- a/rex.project/x86_64/units/stage1.units +++ b/rex.project/x86_64/units/stage1.units @@ -1,23 +1,23 @@ { - "units": [ - { - "name": "welcome", - "target": "components/stage1/welcome.bash", + "units": [ + { + "name": "welcome", + "target": "components/stage1/welcome.bash", "is_shell_command": true, "shell_definition": "bash", "force_pty": true, "set_working_directory": false, "working_directory": "", - "rectify": false, - "rectifier": "", - "active": true, - "required": true, - "set_user_context": true, - "user": "$build_user", - "group": "$build_group", + "rectify": false, + "rectifier": "", + "active": true, + "required": true, + "set_user_context": true, + "user": "$build_user", + "group": "$build_group", "supply_environment": true, - "environment": "environments/stage1.env.bash" - }, + "environment": "environments/stage1.env.bash" + }, { "name": "check dependencies", "target": "components/stage1/check_dependencies.bash",